From d9408158318d3c467efdffa3dee52ba6af492d11 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Tue, 19 Aug 2025 09:09:08 +1000
Subject: [PATCH] Don't rely on qt version switch for extra compilation options

---
 .docker/docker-qgis-build.sh    | 16 ++++++++--------
 .github/workflows/run-tests.yml | 21 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/.docker/docker-qgis-build.sh b/.docker/docker-qgis-build.sh
index 3ea9d8b8c88..5f2e0c49350 100755
--- a/.docker/docker-qgis-build.sh
+++ b/.docker/docker-qgis-build.sh
@@ -93,22 +93,22 @@ cmake \
  -DWITH_GRASS8=${WITH_GRASS8} \
  -DWITH_GRASS_PLUGIN=${WITH_GRASS8} \
  -DENABLE_TESTS=ON \
- -DENABLE_MODELTEST=${WITH_QT5} \
- -DENABLE_PGTEST=${WITH_QT5} \
- -DENABLE_MSSQLTEST=${WITH_QT5} \
- -DENABLE_MSSQLTEST_CPP=${WITH_QT5} \
- -DENABLE_HANATEST=${WITH_QT5} \
- -DENABLE_ORACLETEST=${WITH_QT5} \
+ -DENABLE_MODELTEST=${WITH_MODEL_TEST} \
+ -DENABLE_PGTEST=${WITH_PG_TEST} \
+ -DENABLE_MSSQLTEST=${WITH_MSSQL_TEST} \
+ -DENABLE_MSSQLTEST_CPP=${WITH_MSSQL_TEST} \
+ -DENABLE_HANATEST=${WITH_HANA_TEST} \
+ -DENABLE_ORACLETEST=${WITH_ORACLE_TEST} \
  -DENABLE_UNITY_BUILDS=${ENABLE_UNITY_BUILDS} \
  -DPUSH_TO_CDASH=${PUSH_TO_CDASH} \
  -DWITH_HANA=ON \
  -DWITH_QGIS_PROCESS=ON \
- -DWITH_QSPATIALITE=${WITH_QT5} \
+ -DWITH_QSPATIALITE=${WITH_QSPATIALITE} \
  -DWITH_APIDOC=OFF \
  -DWITH_ASTYLE=OFF \
  -DWITH_BINDINGS=ON \
  -DWITH_SERVER=ON \
- -DWITH_SERVER_LANDINGPAGE_WEBAPP=${WITH_QT5} \
+ -DWITH_SERVER_LANDINGPAGE_WEBAPP=${WITH_SERVER_LANDINGPAGE_WEBAPP} \
  -DWITH_ORACLE=ON \
  -DWITH_PDAL=ON \
  -DWITH_QTSERIALPORT=ON \
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 7c50c8490ab..37e4b4efadb 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -55,6 +55,13 @@ jobs:
             with-webengine: OFF
             with-pdf4qt: OFF
             with-compile-commands: ON
+            with-model-test: ON
+            with-pg-test: ON
+            with-mssql-test: ON
+            with-hana-test: ON
+            with-oracle-test: ON
+            with-qspatialite: ON
+            with-server-landingpage-webapp: ON
             # LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so
             experimental: false
             unity-builds: ON
@@ -72,6 +79,13 @@ jobs:
             with-webengine: ON
             with-pdf4qt: ON
             with-compile-commands: OFF
+            with-model-test: OFF
+            with-pg-test: OFF
+            with-mssql-test: OFF
+            with-hana-test: OFF
+            with-oracle-test: OFF
+            with-qspatialite: OFF
+            with-server-landingpage-webapp: OFF
             LD_PRELOAD: ''
             experimental: false
             unity-builds: ON
@@ -168,6 +182,13 @@ jobs:
                      --env WITH_CLAZY=${{ matrix.with-clazy }} \
                      --env WITH_COMPILE_COMMANDS=${{ matrix.with-compile-commands }} \
                      --env ENABLE_UNITY_BUILDS=${{ matrix.unity-builds }} \
+                     --env WITH_MODEL_TEST=${{ matrix.with-model-test }} \
+                     --env WITH_PG_TEST=${{ matrix.with-pg-test }} \
+                     --env WITH_MSSQL_TEST=${{ matrix.with-mssql-test }} \
+                     --env WITH_HANA_TEST=${{ matrix.with-hana-test }} \
+                     --env WITH_ORACLE_TEST=${{ matrix.with-oracle-test }} \
+                     --env WITH_QSPATIALITE=${{ matrix.with-qspatialite-test }} \
+                     --env WITH_SERVER_LANDINGPAGE_WEBAPP=${{ matrix.with-server-landingpage-webapp }} \
                      qgis3-build-deps \
                      /root/QGIS/.docker/docker-qgis-build.sh