diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-17 16:40:46 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-17 16:40:46 +0100 |
commit | db92906c540a1566d88d025dd24698cb203bea91 (patch) | |
tree | 7fa361ae834156cee9ec123bea8a31fcad2ba267 | |
parent | 0f6f6f8608f70ab32d4b5257d5140602be209fc6 (diff) | |
parent | 3ad671581149d22eaa2f1562f32cea754bfb1087 (diff) | |
download | qtsensors-db92906c540a1566d88d025dd24698cb203bea91.tar.gz |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I4fce7346281a0e89621bc8a38ade07526fb565a8
-rw-r--r-- | tests/auto/auto.pro | 6 |
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 |