diff options
Diffstat (limited to 'src/imports/qtquick2')
| -rw-r--r-- | src/imports/qtquick2/plugin.cpp | 8 | ||||
| -rw-r--r-- | src/imports/qtquick2/qtquick2.pro | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp index 808d5196b2..2cb70a4fd3 100644 --- a/src/imports/qtquick2/plugin.cpp +++ b/src/imports/qtquick2/plugin.cpp @@ -39,23 +39,23 @@ ** ****************************************************************************/ -#include <QtDeclarative/qdeclarativeextensionplugin.h> +#include <QtQml/qqmlextensionplugin.h> #include <private/qtquick2_p.h> QT_BEGIN_NAMESPACE //![class decl] -class QtQuick2Plugin : public QDeclarativeExtensionPlugin +class QtQuick2Plugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick")); Q_UNUSED(uri); - QDeclarativeQtQuick2Module::defineModule(); + QQmlQtQuick2Module::defineModule(); } }; //![class decl] diff --git a/src/imports/qtquick2/qtquick2.pro b/src/imports/qtquick2/qtquick2.pro index 3f76abd87f..3a95c5fd21 100644 --- a/src/imports/qtquick2/qtquick2.pro +++ b/src/imports/qtquick2/qtquick2.pro @@ -5,12 +5,12 @@ include(../qimportbase.pri) SOURCES += \ plugin.cpp -QT += quick-private declarative-private +QT += quick-private qml-private OTHER_FILES += \ qmldir -DESTDIR = $$QT.declarative.imports/$$TARGETPATH +DESTDIR = $$QT.qml.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH qmldir.files += $$PWD/qmldir |