summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/auto.pro6
-rw-r--r--tests/tests.pro47
2 files changed, 31 insertions, 22 deletions
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