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 /examples | |
| 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 'examples')
| -rw-r--r-- | examples/qt3d/qt3d.pro | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index 91163a0d1..52ae5389c 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -1,30 +1,8 @@ TEMPLATE = subdirs SUBDIRS += \ - simple-qml \ simple-cpp \ - multiviewport \ - wireframe \ - shadow-map-qml \ - wave \ - scene3d \ - controls \ - anaglyph-rendering \ - planets-qml \ - instanced-arrays-qml \ - lights \ - compute-particles \ - 3d-text \ - qardboard \ - advancedcustommaterial \ - simplecustommaterial \ - scene2d \ - phong-cubes \ - pbr-materials \ - controlsunderlay \ - scene3dview - -qtHaveModule(multimedia): SUBDIRS += audio-visualizer-qml + 3d-text # qmake seems to break in some CI configurations, disable this for now #SUBDIRS += qgltf @@ -37,5 +15,33 @@ qtHaveModule(widgets) { qtHaveModule(quickwidgets): SUBDIRS += widgets-scene3d } +qtHaveModule(quick) { + qtHaveModule(multimedia) { + SUBDIRS += audio-visualizer-qml + } + + SUBDIRS += \ + simple-qml \ + shadow-map-qml \ + instanced-arrays-qml \ + planets-qml \ + advancedcustommaterial \ + anaglyph-rendering \ + compute-particles \ + phong-cubes \ + lights \ + scene3dview \ + controlsunderlay \ + simplecustommaterial \ + qardboard \ + pbr-materials \ + scene2d \ + multiviewport \ + wireframe \ + wave \ + scene3d \ + controls +} + EXAMPLE_FILES += \ exampleresources |