summaryrefslogtreecommitdiffstats
path: root/tests/auto/q3process
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-05-11 04:28:43 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-05-11 04:41:06 (GMT)
commit842ba1b3878c2973b24936b18a7ee55bdd980be6 (patch)
tree60cfa30ef136fb8a96ee57552759c9726538ecf5 /tests/auto/q3process
parentb21210d646f4aaa639fa480ddf1c8e5fcd9b0572 (diff)
downloadQt-842ba1b3878c2973b24936b18a7ee55bdd980be6.zip
Qt-842ba1b3878c2973b24936b18a7ee55bdd980be6.tar.gz
Qt-842ba1b3878c2973b24936b18a7ee55bdd980be6.tar.bz2
Fixes qt3support unit tests generating compile failures when Qt is not
configured with qt3support. The build system knows when qt3support was turned off, so let's just skip these tests in that case. That makes more sense than individually configuring each autotest machine to skip these tests when the configuration is known to turn off qt3support, which is what's done previously. Reviewed-by: Lincoln Ramsay
Diffstat (limited to 'tests/auto/q3process')
-rw-r--r--tests/auto/q3process/q3process.pro1
-rw-r--r--tests/auto/q3process/tst/tst.pro3
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/q3process/q3process.pro b/tests/auto/q3process/q3process.pro
index 8dc3541..a665c2b 100644
--- a/tests/auto/q3process/q3process.pro
+++ b/tests/auto/q3process/q3process.pro
@@ -5,6 +5,7 @@ SUBDIRS = cat \
tst
TARGET = tst_q3process
QT += qt3support
+requires(contains(QT_CONFIG,qt3support))
#no install rule for subdir
INSTALLS =
diff --git a/tests/auto/q3process/tst/tst.pro b/tests/auto/q3process/tst/tst.pro
index 090d76b..359148b 100644
--- a/tests/auto/q3process/tst/tst.pro
+++ b/tests/auto/q3process/tst/tst.pro
@@ -11,6 +11,7 @@ win32 {
}
}
-contains(QT_CONFIG, qt3support): QT += qt3support
+QT += qt3support
+requires(contains(QT_CONFIG,qt3support))