remove pointless qmltest conditionals

it is a module within this repository, and consequently the flag is
always set.

Change-Id: I8ffdd6903b1b0835725b824a9deb961d0124ce11
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

diff --git a/examples/examples.pro b/examples/examples.pro
index d3d2f55..5af1901 100644 (file)
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,11 @@
 TEMPLATE = subdirs
-SUBDIRS += demos shared localstorage particles qml quick tutorials window
-contains(QT_CONFIG, qmltest): SUBDIRS += qmltest
+SUBDIRS += \
+    demos \
+    shared \
+    localstorage \
+    particles \
+    qml \
+    quick \
+    tutorials \
+    window \
+    qmltest

diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index f7861ac..899c437 100644 (file)
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,5 +1,10 @@
 TEMPLATE = subdirs
 
-SUBDIRS += qtquick2 particles window folderlistmodel localstorage
-contains(QT_CONFIG, qmltest): SUBDIRS += testlib
+SUBDIRS += \
+    qtquick2 \
+    particles \
+    window \
+    folderlistmodel \
+    localstorage \
+    testlib
 contains(QT_CONFIG, xmlpatterns) : SUBDIRS += xmllistmodel

diff --git a/src/src.pro b/src/src.pro
index a591ffc..f1b2663 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,8 +1,10 @@
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS += qml quick particles plugins
-
-contains(QT_CONFIG, qmltest): SUBDIRS += qmltest
-
-SUBDIRS += imports
-SUBDIRS += qmldevtools
+SUBDIRS += \
+    qml \
+    quick \
+    qmltest \
+    particles \
+    plugins \
+    imports \
+    qmldevtools

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 3f5ac69..818bbda 100644 (file)
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -4,8 +4,7 @@ SUBDIRS=\
     quick \
     headersclean \
     particles \
+    qmltest \
     qmldevtools
 
 testcocoon: SUBDIRS -= headersclean
-
-contains(QT_CONFIG, qmltest): SUBDIRS += qmltest

diff --git a/tools/tools.pro b/tools/tools.pro
index 1ce5667..3966411 100644 (file)
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -1,6 +1,12 @@
 TEMPLATE = subdirs
-SUBDIRS +=  qmlscene qmlplugindump qmlmin qmleasing qmlprofiler qmlbundle
+SUBDIRS += \
+    qmlscene \
+    qmlplugindump \
+    qmlmin \
+    qmleasing \
+    qmlprofiler \
+    qmlbundle \
+    qmltestrunner
 !contains(QT_CONFIG, no-widgets):SUBDIRS += easingcurveeditor
-contains(QT_CONFIG, qmltest): SUBDIRS += qmltestrunner