summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-03-17 16:40:46 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2015-03-17 16:40:46 +0100
commitdb92906c540a1566d88d025dd24698cb203bea91 (patch)
tree7fa361ae834156cee9ec123bea8a31fcad2ba267
parent0f6f6f8608f70ab32d4b5257d5140602be209fc6 (diff)
parent3ad671581149d22eaa2f1562f32cea754bfb1087 (diff)
downloadqtsensors-db92906c540a1566d88d025dd24698cb203bea91.tar.gz
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I4fce7346281a0e89621bc8a38ade07526fb565a8
-rw-r--r--tests/auto/auto.pro6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 329ba7b..ffcb62c 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,9 +1,11 @@
TEMPLATE = subdirs
SUBDIRS += qsensor
-SUBDIRS += sensors2qmlapi
+qtHaveModule(qml) {
+ SUBDIRS += sensors2qmlapi
+ SUBDIRS += qtsensors5
+}
#SUBDIRS += legacy_sensors
-SUBDIRS += qtsensors5
SUBDIRS += qsensorgestures
SUBDIRS += qsensorgestureplugins
SUBDIRS += cmake