summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativepixmapcache
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2011-01-18 04:16:47 (GMT)
committerJoona Petrell <joona.t.petrell@nokia.com>2011-01-18 04:46:10 (GMT)
commite46c44f9538dbe5b44ce61d3a42403cfa471ae8b (patch)
tree81cd4597ddef2db0509a1e5f17b0e3c58858375d /tests/auto/declarative/qdeclarativepixmapcache
parent9f6fd23fda43a5668d3fad398eb3e9d80cee9c44 (diff)
downloadQt-e46c44f9538dbe5b44ce61d3a42403cfa471ae8b.zip
Qt-e46c44f9538dbe5b44ce61d3a42403cfa471ae8b.tar.gz
Qt-e46c44f9538dbe5b44ce61d3a42403cfa471ae8b.tar.bz2
Fix declarative autotest compilation on Symbian
Task-number: Reviewed-by: Martin Jones
Diffstat (limited to 'tests/auto/declarative/qdeclarativepixmapcache')
-rw-r--r--tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
index 50d0731..df7c694 100644
--- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
+++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
@@ -47,6 +47,11 @@
#include "testhttpserver.h"
#include "../../../shared/util.h"
+#ifndef QT_NO_CONCURRENT
+#include <qtconcurrentrun.h>
+#include <qfuture.h>
+#endif
+
// These don't let normal people run tests!
//#include "../network-settings.h"
@@ -74,7 +79,10 @@ private slots:
void massive();
void cancelcrash();
void shrinkcache();
+#ifndef QT_NO_CONCURRENT
void networkCrash();
+#endif
+
private:
QDeclarativeEngine engine;
QUrl thisfile;
@@ -354,6 +362,8 @@ void tst_qdeclarativepixmapcache::shrinkcache()
}
}
+#ifndef QT_NO_CONCURRENT
+
void createNetworkServer()
{
QEventLoop eventLoop;
@@ -378,6 +388,8 @@ void tst_qdeclarativepixmapcache::networkCrash()
future.cancel();
}
+#endif
+
QTEST_MAIN(tst_qdeclarativepixmapcache)
#include "tst_qdeclarativepixmapcache.moc"