Enable compiling non-QML API against Qt 5.15

Built with QtQuick disabled.

- C++17 required
- minor issues with QList vs QVector
- QMutexLocker templated vs not
- moc forward declaration handling

Change-Id: I5540625e74e2c009e528f56203e4b88be8d54599
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

3 files changed, 7 insertions, 4 deletions

diff --git a/tests/auto/render/commons/commons.pri b/tests/auto/render/commons/commons.pri
index 1c6645f8d..a91985fc4 100644
--- a/tests/auto/render/commons/commons.pri
+++ b/tests/auto/render/commons/commons.pri
@@ -10,5 +10,6 @@ useCommonTestAspect {
 }
 
 INCLUDEPATH += $$PWD
+CONFIG += c++17
 
 QT += core-private 3dcore 3dcore-private 3drender 3drender-private
diff --git a/tests/benchmarks/render/render.pro b/tests/benchmarks/render/render.pro
index 98d2ba1e7..96f2c306c 100644
--- a/tests/benchmarks/render/render.pro
+++ b/tests/benchmarks/render/render.pro
@@ -1,8 +1,10 @@
 TEMPLATE=subdirs
 
 qtConfig(private_tests) {
-    SUBDIRS += jobs \
-               layerfiltering \
+    SUBDIRS += layerfiltering \
                materialparametergathering \
                opengl
+
+    qtHaveModule(quick): \
+        SUBDIRS += jobs
 }
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index 1a5689bc6..8fea8cb48 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -11,8 +11,7 @@ SUBDIRS += \
     deferred-renderer-cpp \
     raster-cpp \
     qtbug-72236 \
-    manual-renderloop \
-    boundingvolumes
+    manual-renderloop
 
 QT_FOR_CONFIG += 3drender-private
 qtConfig(qt3d-rhi-renderer): {
@@ -101,6 +100,7 @@ qtHaveModule(quick) {
         qtbug-76766 \
         scene3d-in-sync \
         compressed_textures \
+        boundingvolumes
 }
 
 qtHaveModule(quickwidgets): SUBDIRS += quickwidget-switch