diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-16 14:43:03 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 04:51:31 +0100 |
| commit | b855240b782395f94315f43ea3e7e182299fac48 (patch) | |
| tree | bc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src/imports/qtquick2 | |
| parent | 6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff) | |
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported
by the quick1 module.
Users can apply the bin/rename-qtdeclarative-symbols.sh
script to modify client code using the previous names of the
renamed symbols.
Task-number: QTBUG-23737
Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66
Reviewed-by: Martin Jones <martin.jones@nokia.com>
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 |