From 722bd48b0d813481460b0a64138bed537cecb6de Mon Sep 17 00:00:00 2001
From: Andreas Reischuck <andreas.reischuck@hicknhack-software.com>
Date: Wed, 25 Dec 2024 11:52:46 +0100
Subject: [PATCH] Fix Qt 6.8.1 deprecation limit and extend CI [2]

---
 .github/workflows/clang.yml     | 3 ++-
 .github/workflows/gcc.yml       | 1 +
 .github/workflows/windows.yml   | 7 ++++++-
 CMakeLists.txt                  | 2 +-
 tests/qt/qobject/CMakeLists.txt | 2 +-
 tests/qt/qobject/qobject.qbs    | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
index a958950..26bae6d 100644
--- a/.github/workflows/clang.yml
+++ b/.github/workflows/clang.yml
@@ -13,7 +13,7 @@ jobs:
         - experimental: true # seems clang version is too old
           std_cpp: C++20
 
-    runs-on: "macos-12"
+    runs-on: "macos-13"
     env:
       QMAKESPEC: macx-clang
     steps:
@@ -37,6 +37,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
+        - image: arbmind/qbs-clang-libstdcpp-qt:2.5.0-19-14-6.8.1
         - image: arbmind/qbs-clang-libstdcpp-qt:2.3.1-18-14-6.7.1
         - image: arbmind/qbs-clang-libstdcpp-qt:1.24.1-16-12-6.5.0
         - image: arbmind/qbs-clang-libstdcpp-qt:1.22.0-14-11-6.3.0
diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
index f1ec50c..7516bb2 100644
--- a/.github/workflows/gcc.yml
+++ b/.github/workflows/gcc.yml
@@ -9,6 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - image: arbmind/qbs-gcc-qt:2.5.0-14-6.8.1
           - image: arbmind/qbs-gcc-qt:2.3.1-14-6.7.1
           - image: arbmind/qbs-gcc-qt:1.24.1-12-6.5.0
           - image: arbmind/qbs-gcc-qt:1.22.1-12-6.3.1
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index fcc9f98..6c9467f 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -11,7 +11,12 @@ jobs:
         include:
           - host_system: windows-2022
             vcvars: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat
-            qt_version: "6.7.2"
+            qt_version: "6.8.1"
+            qt_arch: win64_msvc2022_64
+
+          - host_system: windows-2022
+            vcvars: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat
+            qt_version: "6.7.3"
             qt_arch: win64_msvc2019_64
 
           - host_system: windows-2022
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e9503e..dc7d45f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ project(Verdigris
 
 enable_testing()
 
-find_package(Qt6 "6.2...<6.6" COMPONENTS Core Test REQUIRED)
+find_package(Qt6 "6.2...<6.9" COMPONENTS Core Test REQUIRED)
 
 add_subdirectory("src")
 add_subdirectory("tools")
diff --git a/tests/qt/qobject/CMakeLists.txt b/tests/qt/qobject/CMakeLists.txt
index b0d9072..038ff5a 100644
--- a/tests/qt/qobject/CMakeLists.txt
+++ b/tests/qt/qobject/CMakeLists.txt
@@ -12,7 +12,7 @@ target_link_libraries(qobject PRIVATE
   Qt6::Network
 )
 target_compile_definitions(qobject PRIVATE
-  QT_DISABLE_DEPRECATED_BEFORE=0
+  QT_DISABLE_DEPRECATED_BEFORE=0x40800
   QT_NO_DEBUG
   W_SIGNALBUG="$<TARGET_FILE:signalbug>"
 )
diff --git a/tests/qt/qobject/qobject.qbs b/tests/qt/qobject/qobject.qbs
index ef3f292..5595ef2 100644
--- a/tests/qt/qobject/qobject.qbs
+++ b/tests/qt/qobject/qobject.qbs
@@ -12,7 +12,7 @@ Project {
         type: ["application", "autotest"]
 
         Depends { name: "cpp" }
-        cpp.defines: base.concat("QT_DISABLE_DEPRECATED_BEFORE=0", "QT_NO_DEBUG")
+        cpp.defines: base.concat("QT_DISABLE_DEPRECATED_BEFORE=0x040800", "QT_NO_DEBUG")
         Depends { name: "Verdigris" }
         Depends { name: "Qt.core" }
         Depends { name: "Qt.network" }