summaryrefslogtreecommitdiffstats
path: root/tests/auto/auto.pro
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-11 18:21:54 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-17 03:30:55 +0200
commita1121b977e84590b8e8c6000b40b8bd90ec9c690 (patch)
treebff156974cd5706c8317afc1cd49268e85ac4022 /tests/auto/auto.pro
parentfe48366b48473282d448a8b0dd6fb9286272f465 (diff)
Make test .pro files more consistent.
Make the parent .pro files follow the pattern of listing all tests in one place and then removing inapplicable tests as needed. Change-Id: Ide1ae98d50dd63cd8c1b4d6fd53135cdff801bc3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/auto.pro')
-rw-r--r--tests/auto/auto.pro17
1 files changed, 11 insertions, 6 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 5eda1236b7..86fe037887 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -2,15 +2,20 @@ TEMPLATE = subdirs
SUBDIRS += \
corelib.pro \
+ dbus \
+ host.pro \
gui.pro \
network.pro \
+ opengl \
sql \
- xml \
testlib \
+ tools \
+ v8.pro \
+ xml \
other.pro \
-!cross_compile: SUBDIRS += host.pro
-!cross_compile: SUBDIRS += tools
-contains(QT_CONFIG, opengl): SUBDIRS += opengl
-unix:!embedded:contains(QT_CONFIG, dbus): SUBDIRS += dbus
-contains(QT_CONFIG, v8): SUBDIRS += v8.pro
+cross_compile: SUBDIRS -= host.pro
+cross_compile: SUBDIRS -= tools
+!contains(QT_CONFIG, opengl): SUBDIRS -= opengl
+!unix|embedded|!contains(QT_CONFIG, dbus): SUBDIRS -= dbus
+!contains(QT_CONFIG, v8): SUBDIRS -= v8.pro