Qt6 Port and more

.github/workflows/testing.yml

@@ -1,37 +1,76 @@
 name: Test Build
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [ main, master, release-* ]
+  pull_request:
+    branches: [ main, master ]
 
 jobs:
-  test:
+  build:
+    name: Build (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        os: [windows-latest, macOS-latest, ubuntu-latest]
+        os: [windows-latest, macos-latest, ubuntu-latest]
 
     steps:
-    - name: Install Qt
-      uses: jurplel/install-qt-action@v2
+    - name: Checkout Code
+      uses: actions/checkout@v4
       with:
-        modules: 'qtcore qtgui qtwidgets qtopengl qtnetwork qtsvg qtscript qtscripttools qtprintsupport qtdatavis3d'
-
-    - name: clone repository
-      uses: actions/checkout@v2
+        submodules: recursive
 
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: '6.8.3'
+        modules: 'qtdatavis3d qt5compat qtshadertools'
+        arch: ${{ runner.os == 'Windows' && 'win64_msvc2022_64' || '' }}
 
-    - name: Install Dependantcies And Make Linux
-      if: startsWith(matrix.os, 'ubuntu')
+    # --- LINUX ---
+    - name: Dependencies (Linux)
+      if: runner.os == 'Linux'
       run: |
-        sudo apt-get update -qq
+        sudo apt-get update
         sudo apt-get install -y libgsl-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev
-        qmake CONFIG+=linux_all_dynamic
-        make
-
-
-    - name: Install Dependantcies And Make Mac
-      if: startsWith(matrix.os, 'mac')
+
+    - name: Build (Linux)
+      if: runner.os == 'Linux'
+      run: |
+        qmake PRESET=linux_all_dynamic INCLUDEPATH+=/usr/include QMAKE_LIBDIR+=/usr/lib/x86_64-linux-gnu
+        make -j$(nproc)
+
+    # --- MACOS ---
+    - name: Dependencies (macOS)
+      if: runner.os == 'macOS'
+      run: brew install gsl
+
+    - name: Build (macOS)
+      if: runner.os == 'macOS'
+      run: |
+        qmake PRESET=osx_dist INCLUDEPATH+=/opt/homebrew/include QMAKE_LIBDIR+=/opt/homebrew/lib
+        make -j$(sysctl -n hw.ncpu)
+
+    # --- WINDOWS ---
+    - name: Dependencies (Windows)
+      if: runner.os == 'Windows'
+      shell: cmd
+      run: |
+        vcpkg install gsl:x64-windows
+        echo GSL_ROOT=%VCPKG_INSTALLATION_ROOT%/installed/x64-windows>> %GITHUB_ENV%
+
+    - name: Set up MSVC (Windows)
+      if: runner.os == 'Windows'
+      uses: ilammy/msvc-dev-cmd@v1
+
+    - name: Build (Windows)
+      if: runner.os == 'Windows'
+      shell: cmd
       run: |
-        brew install gsl
-        qmake CONFIG+=osx_dist
-        make
-
+        cl
+        qmake -v
+        qmake -query
+        set
+        qmake PRESET=win32
+        nmake

.gitignore

@@ -0,0 +1,70 @@
+# C++ objects and libs
+*.slo
+*.lo
+*.o
+*.a
+*.la
+*.lai
+*.so
+*.so.*
+*.dll
+*.dylib
+
+# Qt-es
+object_script.*.Release
+object_script.*.Debug
+*_plugin_import.cpp
+/.qmake.cache
+/.qmake.stash
+/build/.qmake.cache
+/build/.qmake.stash
+*.pro.user
+*.pro.user.*
+*.qbs.user
+*.qbs.user.*
+*.moc
+moc_*.cpp
+moc_*.h
+qrc_*.cpp
+ui_*.h
+*.qmlc
+*.jsc
+Makefile*
+*build-*
+*.qm
+*.prl
+
+# Qt unit tests
+target_wrapper.*
+
+# QtCreator
+*.autosave
+
+# QtCreator Qml
+*.qmlproject.user
+*.qmlproject.user.*
+
+# QtCreator CMake
+CMakeLists.txt.user*
+
+# QtCreator 4.8< compilation database
+compile_commands.json
+
+# QtCreator local machine specific files for imported projects
+*creator.user*
+
+*_qmlcache.qrc
+
+# Temporary files
+*.tmp
+*.log
+*.bak
+*.swp
+
+# test output & cache
+Run-make.sh
+Testing/
+.cache/
+temp/
+build_retry/
+/alphaplot/alphaplot

.qmake.conf

@@ -0,0 +1,4 @@
+# Fail-safe MSVC version detection for GitHub Actions
+win32 {
+    isEmpty(QMAKE_MSC_VER): QMAKE_MSC_VER = 1944
+}

3rdparty/epsengine/EpsPaintDevice.cpp

@@ -9,7 +9,8 @@ Description          : Enables the export of QPainter grafics to .eps files
 #include "EpsEngine.h"
 
 #include <QApplication>
-#include <QDesktopWidget>
+#include <QScreen>
+#include <QGuiApplication>
 
 EpsPaintDevice::EpsPaintDevice(const QString& fileName, const QSize& s)
 : QPaintDevice()
@@ -49,7 +50,7 @@ void EpsPaintDevice::setCreator(const QString& s)
 
 int EpsPaintDevice::metric(PaintDeviceMetric metric) const
 {
-	QDesktopWidget *desktop = QApplication::desktop();
+	QScreen *desktop = QGuiApplication::primaryScreen();
 	int dpi_x = desktop->logicalDpiX();
 	int dpi_y = desktop->logicalDpiY();
 	switch (metric){