diff options
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/declarative.pro | 2 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativeutilmodule.cpp | 6 |
2 files changed, 4 insertions, 4 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", |