projects
/
konrad/qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
4678acf
)
Teach build system tst_qdeclarativepixmapcache needs QtConcurrent
author
Alan Alpert
<alan.alpert@nokia.com>
Mon, 6 Feb 2012 01:38:24 +0000 (11:38 +1000)
committer
Qt by Nokia
<qt-info@nokia.com>
Mon, 6 Feb 2012 01:48:08 +0000 (
02:48
+0100)
So if QtConcurrent is disabled, this test should be too.
Change-Id: Ib4c6a952f73fc21bb201cf6017cd3e73732fbe7b
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
tests/auto/qtquick2/qtquick2.pro
patch
|
blob
|
history
diff --git
a/tests/auto/qtquick2/qtquick2.pro
b/tests/auto/qtquick2/qtquick2.pro
index
8b8c5c9
..
0722fd3
100644
(file)
--- 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 \