diff options
7 files changed, 11 insertions, 22 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 2232ac34..fc430483 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -3,7 +3,7 @@ load(qt_module) TARGET = QtQuick1 QPRO_PWD = $$PWD -QT += core core-private gui gui-private widgets widgets-private script script-private network xmlpatterns +QT += core core-private gui gui-private widgets widgets-private script script-private network contains(QT_CONFIG, svg): QT += svg CONFIG += module diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp index 6a2bb75c..669604e6 100644 --- a/src/declarative/util/qdeclarativeutilmodule.cpp +++ b/src/declarative/util/qdeclarativeutilmodule.cpp @@ -70,7 +70,7 @@ #include "qdeclarativeview.h" #include "qdeclarativeinfo.h" #include "private/qdeclarativetypenotavailable_p.h" -#ifndef QT_NO_XMLPATTERNS +#ifdef QT_XMLPATTERNS_LIB #include "private/qdeclarativexmllistmodel_p.h" #endif @@ -106,7 +106,7 @@ void QDeclarativeUtilModule::defineModule() qmlRegisterType<QDeclarativeTimer>("QtQuick",1,0,"Timer"); qmlRegisterType<QDeclarativeTransition>("QtQuick",1,0,"Transition"); qmlRegisterType<QDeclarativeVector3dAnimation>("QtQuick",1,0,"Vector3dAnimation"); -#ifdef QT_NO_XMLPATTERNS +#ifndef QT_XMLPATTERNS_LIB qmlRegisterTypeNotAvailable("QtQuick",1,0,"XmlListModel", qApp->translate("QDeclarativeXmlListModel","Qt was built without support for xmlpatterns")); qmlRegisterTypeNotAvailable("QtQuick",1,0,"XmlRole", @@ -155,7 +155,7 @@ void QDeclarativeUtilModule::defineModule() qmlRegisterType<QDeclarativeTimer>("Qt",4,7,"Timer"); qmlRegisterType<QDeclarativeTransition>("Qt",4,7,"Transition"); qmlRegisterType<QDeclarativeVector3dAnimation>("Qt",4,7,"Vector3dAnimation"); -#ifdef QT_NO_XMLPATTERNS +#ifndef QT_XMLPATTERNS_LIB qmlRegisterTypeNotAvailable("Qt",4,7,"XmlListModel", qApp->translate("QDeclarativeXmlListModel","Qt was built without support for xmlpatterns")); qmlRegisterTypeNotAvailable("Qt",4,7,"XmlRole", 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 |