diff options
Diffstat (limited to 'tests/auto/declarative/qdeclarativepixmapcache')
-rw-r--r-- | tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro | 4 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro index 7f888b70..d7ec8c87 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro +++ b/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro @@ -23,7 +23,3 @@ symbian: { # LIBS += -lgcov CONFIG += parallel_test - - -# XXX: Remove when issues with QtConcurrent are resolved. -DEFINES *= QT_NO_CONCURRENT diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp index 9682f4da..21f92359 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp +++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp @@ -46,7 +46,7 @@ #include <QNetworkReply> #include "testhttpserver.h" -#ifndef QT_NO_CONCURRENT +#ifdef QT_CONCURRENT_LIB #include <qtconcurrentrun.h> #include <qfuture.h> #endif @@ -78,7 +78,7 @@ private slots: void massive(); void cancelcrash(); void shrinkcache(); -#ifndef QT_NO_CONCURRENT +#ifdef QT_CONCURRENT_LIB void networkCrash(); #endif private: @@ -360,7 +360,7 @@ void tst_qdeclarativepixmapcache::shrinkcache() } } -#ifndef QT_NO_CONCURRENT +#ifdef QT_CONCURRENT_LIB void createNetworkServer() { @@ -371,7 +371,6 @@ void createNetworkServer() eventLoop.exec(); } -#ifndef QT_NO_CONCURRENT // QT-3957 void tst_qdeclarativepixmapcache::networkCrash() { @@ -386,7 +385,6 @@ void tst_qdeclarativepixmapcache::networkCrash() } future.cancel(); } -#endif #endif |