diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-02-21 11:01:51 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-22 00:44:07 +0100 |
| commit | 9183957619ede36af59bc058898b98c95c66967e (patch) | |
| tree | bd9c57e814d42cc6c4de168ac325ab43ea027ce3 /tests/auto/declarative | |
| parent | 650a8ccc21f8e65730afb195b05790e3b3f9985f (diff) | |
Fix build issues related to QT_NO_*MODULE* defines.
The QT_NO_XMLPATTERNS and QT_NO_CONCURRENT defines don't exist in
Qt5 check for the existance of the modules with QT_XMLPATTERNS_LIB
and QT_CONCURRENT_LIB instead of their absence with the old defines.
Change-Id: I52bc9932294fe4564e58d06766301e2a0c41f15c
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/declarative')
5 files changed, 7 insertions, 18 deletions
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index b0f1aed7..e1d6bb94 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -75,6 +75,9 @@ contains(QT_CONFIG, private_tests) { qdeclarativeworkerscript \ qdeclarativexmllistmodel \ qpacketprotocol + + # This test requires the xmlpatterns module + !contains(QT_CONFIG,xmlpatterns): SUBDIRS -= qdeclarativexmllistmodel } contains(QT_CONFIG, opengl): SUBDIRS += qmlshadersplugin 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 diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro index a3dfd649..b212b083 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro +++ b/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro @@ -2,11 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativexmllistmodel QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private script gui network core-private script-private -contains(QT_CONFIG,xmlpatterns) { - QT += xmlpatterns - DEFINES += QTEST_XMLPATTERNS -} +contains(QT_CONFIG,quick1): QT += quick1 quick1-private script gui network core-private script-private xmlpatterns macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativexmllistmodel.cpp diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp index 524fa74b..4550f5f4 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp +++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp @@ -53,7 +53,6 @@ #include <QtCore/qfile.h> #include <QtCore/qtemporaryfile.h> -#ifdef QTEST_XMLPATTERNS #include <QtQuick1/qdeclarativeengine.h> #include <QtQuick1/qdeclarativecomponent.h> #include <private/qdeclarativexmllistmodel_p.h> @@ -982,6 +981,3 @@ QTEST_MAIN(tst_qdeclarativexmllistmodel) #include "tst_qdeclarativexmllistmodel.moc" -#else -QTEST_NOOP_MAIN -#endif |