diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 6 | ||||
| -rw-r--r-- | tests/auto/extras/extras.pro | 6 | ||||
| -rw-r--r-- | tests/auto/render/opengl/opengl.pro | 5 | ||||
| -rw-r--r-- | tests/auto/render/render.pro | 31 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 134 |
5 files changed, 105 insertions, 77 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 diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 2f630e0d9..119c4f653 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -1,84 +1,27 @@ TEMPLATE = subdirs SUBDIRS += \ - assimp \ bigscene-cpp \ - bigmodel-qml \ - bigscene-instanced-qml \ - clip-planes-qml \ component-changes \ custom-mesh-cpp \ custom-mesh-cpp-indirect \ - custom-mesh-qml \ custom-mesh-update-data-cpp \ - custom-mesh-update-data-qml \ cylinder-cpp \ cylinder-parent-test \ - cylinder-qml \ deferred-renderer-cpp \ - deferred-renderer-qml \ - downloading \ - dragging \ - dynamicscene-cpp \ - enabled-qml \ - gltf \ - gooch-qml \ - keyboardinput-qml \ - loader-qml \ - lod \ - mouseinput-qml \ - multiplewindows-qml \ - picking-qml \ - plasma \ - pointlinesize \ - scene3d-loader \ - simple-shaders-qml \ - skybox \ - tessellation-modes \ - transforms-qml \ - spritegrid \ - transparency-qml \ - transparency-qml-scene3d \ - rendercapture-qml \ - additional-attributes-qml \ - dynamic-model-loader-qml \ - buffercapture-qml \ - render-qml-to-texture \ - render-qml-to-texture-qml \ - video-texture-qml \ - animation-keyframe-simple \ - animation-keyframe-blendtree \ - distancefieldtext \ - mesh-morphing \ - anim-viewer \ - animation-keyframe-programmatic \ - layerfilter-qml \ - skinned-mesh \ - rigged-simple \ - proximityfilter \ - rendercapture-qml-fbo \ - blitframebuffer-qml \ - raycasting-qml \ - shared_texture_image \ - texture_property_updates \ raster-cpp \ - raster-qml \ qtbug-72236 \ - qtbug-76766 \ - shader-image-qml \ - scene3d-in-sync \ - compressed_textures \ - subtree-enabler-qml \ - scene3d-visibility \ manual-renderloop -!macos:!uikit: SUBDIRS += compute-manual - qtHaveModule(multimedia): { SUBDIRS += \ - sharedtexture \ - sharedtextureqml + sharedtexture + + qtHaveModule(quick) { + SUBDIRS += \ + sharedtextureqml + } } qtHaveModule(widgets): { @@ -88,3 +31,68 @@ qtHaveModule(widgets): { rendercapture-cpp \ texture-updates-cpp } + +qtHaveModule(quick) { + !macos:!uikit: SUBDIRS += compute-manual + + SUBDIRS += \ + assimp \ + animation-keyframe-simple \ + animation-keyframe-blendtree \ + animation-keyframe-programmatic \ + bigmodel-qml \ + bigscene-instanced-qml \ + clip-planes-qml \ + custom-mesh-qml \ + custom-mesh-update-data-qml \ + cylinder-qml \ + deferred-renderer-qml \ + downloading \ + dynamicscene-cpp \ + dragging \ + enabled-qml \ + gltf \ + gooch-qml \ + keyboardinput-qml \ + lod \ + loader-qml \ + mouseinput-qml \ + multiplewindows-qml \ + plasma \ + pointlinesize \ + scene3d-loader \ + picking-qml \ + skybox \ + simple-shaders-qml \ + transparency-qml \ + transparency-qml-scene3d \ + rendercapture-qml \ + additional-attributes-qml \ + dynamic-model-loader-qml \ + buffercapture-qml \ + render-qml-to-texture \ + render-qml-to-texture-qml \ + video-texture-qml \ + transforms-qml \ + layerfilter-qml \ + tessellation-modes \ + rendercapture-qml-fbo \ + blitframebuffer-qml \ + raycasting-qml \ + raster-qml \ + shader-image-qml \ + spritegrid \ + subtree-enabler-qml \ + distancefieldtext \ + mesh-morphing \ + anim-viewer \ + skinned-mesh \ + rigged-simple \ + proximityfilter \ + scene3d-visibility \ + shared_texture_image \ + texture_property_updates \ + qtbug-76766 \ + scene3d-in-sync \ + compressed_textures \ +} |