aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-02-06 11:38:24 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-06 02:48:08 +0100
commit8687c6b44fa6bc17ee056d1d6d83a9cb0baab8a0 (patch)
tree4413012283d3652124d629ba701cfbaba863e4cc /tests/auto
parent4678acf216ec088933fc27012de8569d0c13385b (diff)
Teach build system tst_qdeclarativepixmapcache needs QtConcurrent
So if QtConcurrent is disabled, this test should be too. Change-Id: Ib4c6a952f73fc21bb201cf6017cd3e73732fbe7b Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qtquick2/qtquick2.pro3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/qtquick2/qtquick2.pro b/tests/auto/qtquick2/qtquick2.pro
index 8b8c5c9b9e..0722fd3c0c 100644
--- a/tests/auto/qtquick2/qtquick2.pro
+++ b/tests/auto/qtquick2/qtquick2.pro
@@ -6,6 +6,9 @@ PUBLICTESTS += \
nodes \
qdeclarativepixmapcache
+# This test requires the qtconcurrent module
+!contains(QT_CONFIG, concurrent):PUBLICTESTS -= qdeclarativepixmapcache
+
PRIVATETESTS += \
qdeclarativeanimations \
qdeclarativeapplication \