diff options
| author | Jean-Michaël Celerier <jean-michael.celerier@kdab.com> | 2020-02-26 12:48:53 +0100 |
|---|---|---|
| committer | Jean-Michaël Celerier <jean-michael.celerier@kdab.com> | 2020-03-11 09:36:40 +0100 |
| commit | 3b3c743340909fabd08bcdec78802fc58c779932 (patch) | |
| tree | 7f0edf723b9b97cdf0269848cfcf654d3b97f194 /tests/auto/render | |
| parent | 29e1e596000fb8efeae74417b06634006bf23309 (diff) | |
Split examples so that build works without qtdeclarative
Change-Id: I98507808b43b116b1950fd60df54704562a234ce
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/render')
| -rw-r--r-- | tests/auto/render/opengl/opengl.pro | 5 | ||||
| -rw-r--r-- | tests/auto/render/render.pro | 31 |
2 files changed, 24 insertions, 12 deletions
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 |