summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2010-11-29 17:45:12 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2010-11-30 14:55:16 (GMT)
commit1555eed6c27a843e0ecb09c15a915c0a3f76fd1e (patch)
treef9f5a1e4545b0c6a6f5bf1ed39aaae5e6ee707ee /tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
parentf417baad9235e90b5e9aae2fd06d664635c68bec (diff)
downloadQt-1555eed6c27a843e0ecb09c15a915c0a3f76fd1e.zip
Qt-1555eed6c27a843e0ecb09c15a915c0a3f76fd1e.tar.gz
Qt-1555eed6c27a843e0ecb09c15a915c0a3f76fd1e.tar.bz2
QtDeclarative: make autotests compile on symbian
Move tests for private classes inside private_tests scope Add missing libraries Add QT_NO_CONCURRENT ifdef around a test case Define Q_DECLARATIVE_PRIVATE_EXPORT as Q_AUTOTEST_EXPORT, so the classes are exported for autotests, previously they were exported on every OS except symbian. (this doesn't affect exports for production builds) Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp')
-rw-r--r--tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
index 50d0731..1a38e87 100644
--- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
+++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
@@ -74,7 +74,9 @@ private slots:
void massive();
void cancelcrash();
void shrinkcache();
+#ifndef QT_NO_CONCURRENT
void networkCrash();
+#endif
private:
QDeclarativeEngine engine;
QUrl thisfile;
@@ -363,6 +365,7 @@ void createNetworkServer()
eventLoop.exec();
}
+#ifndef QT_NO_CONCURRENT
// QT-3957
void tst_qdeclarativepixmapcache::networkCrash()
{
@@ -377,6 +380,7 @@ void tst_qdeclarativepixmapcache::networkCrash()
}
future.cancel();
}
+#endif
QTEST_MAIN(tst_qdeclarativepixmapcache)