From 33b3fe378486eddddf63a320ebcc5ebb3db0e0d5 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Date: Fri, 24 Oct 2014 09:50:12 +0300
Subject: Make build check for existence of quick module.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Icd04b72bb7bdbf34c73e6f27c90674fda4fc4cc2
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 tests/tests.pro | 47 +++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

(limited to 'tests/tests.pro')

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
-- 
cgit v1.2.3