Allow to disable aspects at configure time

This allows to remove dependencies and reduce deployment size when a given
aspect is not required.

Change-Id: I5aa90e4825b375cd446c47727aa11d03c40703c9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

4 files changed, 40 insertions, 22 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 7cbb53089..39631ef99 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -2,11 +2,14 @@ TEMPLATE = subdirs
 
 SUBDIRS = \
     core \
-    render \
-    quick3d \
-    cmake \
-    input \
-    animation \
-    extras
+    cmake
 
 installed_cmake.depends = cmake
+QT_FOR_CONFIG += 3dcore
+
+qtConfig(qt3d-render): SUBDIRS += render
+qtConfig(qt3d-input): SUBDIRS += input
+qtConfig(qt3d-animation): SUBDIRS += animation
+qtConfig(qt3d-extras): SUBDIRS += extras
+qtConfig(qt3d-render):qtConfig(qt3d-input): SUBDIRS += quick3d
+
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index e5637df75..40e2262c2 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -14,7 +14,6 @@ qtConfig(private_tests) {
         material \
         vsyncframeadvanceservice \
         meshfunctors \
-        qmaterial \
         qattribute \
         qbuffer \
         qgeometry \
@@ -24,7 +23,6 @@ qtConfig(private_tests) {
         buffer \
         attribute \
         geometry \
-        geometryloaders \
         geometryrenderer \
         raycasting \
         qcameraselector \
@@ -44,11 +42,8 @@ qtConfig(private_tests) {
         framegraphnode \
         qobjectpicker \
         objectpicker \
-        picking \
 #        qboundingvolumedebug \
 #        boundingvolumedebug \
-        boundingsphere \
-        qdefaultmeshes \
         trianglesextractor \
         triangleboundingvolume \
         ddstextures \
@@ -70,8 +65,6 @@ qtConfig(private_tests) {
         graphicshelpergl3_3 \
         graphicshelpergl3_2 \
         graphicshelpergl2 \
-        gltfplugins \
-        pickboundingvolumejob \
         sendrendercapturejob \
         textures \
         qparameter \
@@ -81,8 +74,6 @@ qtConfig(private_tests) {
         qabstracttexture \
         qabstracttextureimage \
         qrendersettings \
-        updatemeshtrianglelistjob \
-        updateshaderdatatransformjob \
         texturedatamanager \
         rendertarget \
         transform \
@@ -107,11 +98,29 @@ qtConfig(private_tests) {
         memorybarrier \
         qshaderprogram \
         qshaderprogrambuilder \
-        qscene2d \
-        scene2d \
         coordinatereader \
         framegraphvisitor \
         renderer
 
+    QT_FOR_CONFIG = 3dcore-private
+    qtConfig(qt3d-extras) {
+        SUBDIRS += \
+            qmaterial \
+            geometryloaders \
+            picking \
+            boundingsphere \
+            qdefaultmeshes \
+            pickboundingvolumejob \
+            gltfplugins \
+            updatemeshtrianglelistjob \
+            updateshaderdatatransformjob
+    }
+
+    qtConfig(qt3d-input) {
+        SUBDIRS += \
+            qscene2d \
+            scene2d
+    }
+
     !macos: SUBDIRS += graphicshelpergl4
 }
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index bcaf713c6..7dfc52eec 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -1,4 +1,7 @@
 TEMPLATE = subdirs
 SUBDIRS = \
-    core \
-    render
+    core
+
+QT_FOR_CONFIG += 3dcore
+
+qtConfig(qt3d-render): SUBDIRS += render
diff --git a/tests/tests.pro b/tests/tests.pro
index 2ab283fc2..157bdcea5 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,8 +1,11 @@
 TEMPLATE = subdirs
 
-!package: SUBDIRS += \
-                auto \
-                manual
+QT_FOR_CONFIG += 3dcore
+
+!package {
+    SUBDIRS += auto
+    qtConfig(qt3d-extras): SUBDIRS += manual
+}
 
 # Benchmarks make sense in release mode only.
 # Disable them for code coverage.