diff options
Diffstat (limited to 'examples/qml/cppextensions/plugins')
| -rw-r--r-- | examples/qml/cppextensions/plugins/plugin.cpp | 8 | ||||
| -rw-r--r-- | examples/qml/cppextensions/plugins/plugins.pro | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/qml/cppextensions/plugins/plugin.cpp b/examples/qml/cppextensions/plugins/plugin.cpp index 4ba0a928eb..5e9900cb4f 100644 --- a/examples/qml/cppextensions/plugins/plugin.cpp +++ b/examples/qml/cppextensions/plugins/plugin.cpp @@ -38,8 +38,8 @@ ** ****************************************************************************/ -#include <QtDeclarative/QDeclarativeExtensionPlugin> -#include <QtDeclarative/qdeclarative.h> +#include <QtQml/QQmlExtensionPlugin> +#include <QtQml/qqml.h> #include <qdebug.h> #include <qdatetime.h> #include <qbasictimer.h> @@ -138,10 +138,10 @@ int TimeModel::instances=0; MinuteTimer *TimeModel::timer=0; //![plugin] -class QExampleQmlPlugin : public QDeclarativeExtensionPlugin +class QExampleQmlPlugin : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface" FILE "plugin.json") + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") public: void registerTypes(const char *uri) diff --git a/examples/qml/cppextensions/plugins/plugins.pro b/examples/qml/cppextensions/plugins/plugins.pro index a28582a07a..08a4d1a61c 100644 --- a/examples/qml/cppextensions/plugins/plugins.pro +++ b/examples/qml/cppextensions/plugins/plugins.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt plugin -QT += declarative +QT += qml DESTDIR = com/nokia/TimeExample TARGET = qmlqtimeexampleplugin @@ -17,11 +17,11 @@ qdeclarativesources.files += \ com/nokia/TimeExample/hour.png \ com/nokia/TimeExample/minute.png -qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins/com/nokia/TimeExample +qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/plugins/com/nokia/TimeExample sources.files += plugins.pro plugin.cpp plugins.qml README -sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins -target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins/com/nokia/TimeExample +sources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/plugins +target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/plugins/com/nokia/TimeExample INSTALLS += qdeclarativesources sources target |