4 files changed, 34 insertions, 14 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 971edcb39..75553c902 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -15,7 +15,11 @@ qtConfig(qt3d-animation): SUBDIRS += animation
 qtConfig(qt3d-extras): SUBDIRS += extras
 qtConfig(qt3d-render) {
     SUBDIRS += geometryloaders
-    qtConfig(qt3d-input): SUBDIRS += quick3d
+    qtConfig(qt3d-input) {
+        qtHaveModule(quick) {
+            SUBDIRS += quick3d
+        }
+    }
 }
 
 for(subdir, SUBDIRS) {
diff --git a/tests/auto/extras/extras.pro b/tests/auto/extras/extras.pro
index e5ae28e97..a9fd78369 100644
--- a/tests/auto/extras/extras.pro
+++ b/tests/auto/extras/extras.pro
@@ -6,6 +6,10 @@ contains(QT_CONFIG, private_tests) {
         qtorusgeometry \
         qforwardrenderer \
         qfirstpersoncameracontroller \
-        qorbitcameracontroller \
+        qorbitcameracontroller
+}
+
+qtHaveModule(quick) {
+    SUBDIRS += \
         qtext2dentity
 }
diff --git a/tests/auto/render/opengl/opengl.pro b/tests/auto/render/opengl/opengl.pro
index 5299ebd36..fead9b5ff 100644
--- a/tests/auto/render/opengl/opengl.pro
+++ b/tests/auto/render/opengl/opengl.pro
@@ -6,7 +6,6 @@ SUBDIRS += \
         graphicshelpergl3_2 \
         graphicshelpergl2 \
         glshadermanager \
-        materialparametergathererjob \
         textures \
         renderer \
         renderviewutils \
@@ -16,4 +15,8 @@ SUBDIRS += \
         qgraphicsutils \
         computecommand
 
+qtHaveModule(quick) {
+    SUBDIRS += \
+        materialparametergathererjob
+}
 !macos: SUBDIRS += graphicshelpergl4
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index f8011b2cf..09dbe68a7 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -97,7 +97,6 @@ qtConfig(private_tests) {
         qraycaster \
         raycaster \
         qscreenraycaster \
-        raycastingjob \
         qcamera \
         qsetfence \
         qwaitfence \
@@ -117,6 +116,11 @@ qtConfig(private_tests) {
         trianglesextractor \
         triangleboundingvolume \
     }
+
+    qtHaveModule(quick) {
+      SUBDIRS += \
+        raycastingjob
+    }
 }
 
 # Tests related to the OpenGL renderer
@@ -125,26 +129,31 @@ QT_FOR_CONFIG += 3drender-private
 qtConfig(qt3d-opengl-renderer):qtConfig(private_tests) {
 
     SUBDIRS += \
-        opengl \
-        scene2d
+        opengl
 
     qtConfig(qt3d-extras) {
+        qtHaveModule(quick) {
+          SUBDIRS += \
+            boundingsphere \
+            pickboundingvolumejob \
+            updatemeshtrianglelistjob \
+            updateshaderdatatransformjob
+        }
+
         SUBDIRS += \
             qmaterial \
             geometryloaders \
             picking \
-            boundingsphere \
             qdefaultmeshes \
-            pickboundingvolumejob \
-            gltfplugins \
-            updatemeshtrianglelistjob \
-            updateshaderdatatransformjob
+            gltfplugins
     }
 
     qtConfig(qt3d-input) {
-        SUBDIRS += \
-            qscene2d \
-            scene2d
+        qtHaveModule(quick) {
+            SUBDIRS += \
+                qscene2d \
+                scene2d
+        }
     }
 
     qtConfig(qt3d-simd-avx2): SUBDIRS += alignedresourcesmanagers-avx