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 /src/declarative/util/qdeclarativeutilmodule.cpp | |
| 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 'src/declarative/util/qdeclarativeutilmodule.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativeutilmodule.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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", |