diff options
| -rw-r--r-- | examples/datavisualization/datavisualization.pro | 27 | ||||
| -rw-r--r-- | src/src.pro | 5 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 6 | ||||
| -rw-r--r-- | tests/tests.pro | 47 |
4 files changed, 49 insertions, 36 deletions
diff --git a/examples/datavisualization/datavisualization.pro b/examples/datavisualization/datavisualization.pro index eab15b6d..b6ece48d 100644 --- a/examples/datavisualization/datavisualization.pro +++ b/examples/datavisualization/datavisualization.pro @@ -1,15 +1,17 @@ TEMPLATE = subdirs -SUBDIRS += qmlbars \ - qmlscatter \ - qmlsurface \ - qmlcustominput \ - qmllegend \ - qmlmultigraph \ - qmloscilloscope \ - qmlsurfacelayers \ - qmlaxisformatter \ - qmlaxisdrag \ - qmlspectrogram +qtHaveModule(quick) { + SUBDIRS += qmlbars \ + qmlscatter \ + qmlsurface \ + qmlcustominput \ + qmllegend \ + qmlmultigraph \ + qmloscilloscope \ + qmlsurfacelayers \ + qmlaxisformatter \ + qmlaxisdrag \ + qmlspectrogram +} !android:!ios { SUBDIRS += bars \ @@ -23,6 +25,7 @@ SUBDIRS += qmlbars \ customitems \ texturesurface \ volumetric + + qtHaveModule(multimedia): SUBDIRS += audiolevels } -qtHaveModule(multimedia):!android:!ios: SUBDIRS += audiolevels diff --git a/src/src.pro b/src/src.pro index 33e3c009..3547745d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,4 +1,5 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += datavisualization \ - datavisualizationqml2 +SUBDIRS += datavisualization + +qtHaveModule(quick): SUBDIRS += datavisualizationqml2 diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 6f70bd1b..df2943a4 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,5 +1,7 @@ TEMPLATE = subdirs -SUBDIRS = qmltest \ - cpptest + +SUBDIRS += cpptest + +qtHaveModule(quick): SUBDIRS += qmltest installed_cmake.depends = cmake diff --git a/tests/tests.pro b/tests/tests.pro index 34ddb5e5..ccecd486 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -7,26 +7,33 @@ contains(QT_CONFIG, opengles1) { TEMPLATE = subdirs -SUBDIRS += barstest \ - scattertest \ - surfacetest \ - qmlcamera \ - qmldynamicdata \ - multigraphs \ - directional \ - qmlmultiwindow \ - itemmodeltest \ - qmlmultitest \ - volumetrictest \ - qmlvolume \ - auto \ - qmlperf +SUBDIRS += auto -#SUBDIRS += kinectsurface +qtHaveModule(quick) { + SUBDIRS += qmlcamera \ + qmldynamicdata \ + qmlmultiwindow \ + qmlmultitest \ + qmlvolume \ + qmlperf +} -qtHaveModule(multimedia):!android:!static: SUBDIRS += spectrum +!android:!ios { + SUBDIRS += barstest \ + scattertest \ + surfacetest \ + multigraphs \ + directional \ + itemmodeltest \ + volumetrictest + + # For testing code snippets of minimal applications + SUBDIRS += minimalbars \ + minimalscatter \ + minimalsurface -# For testing code snippets of minimal applications -SUBDIRS += minimalbars \ - minimalscatter \ - minimalsurface + # Requires Kinect drivers + #SUBDIRS += kinectsurface +} + +qtHaveModule(multimedia):!android:!static: SUBDIRS += spectrum |