aboutsummaryrefslogtreecommitdiffstats
path: root/examples/qml/cppextensions/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'examples/qml/cppextensions/plugins')
-rw-r--r--examples/qml/cppextensions/plugins/plugin.cpp6
-rw-r--r--examples/qml/cppextensions/plugins/plugin.json1
-rw-r--r--examples/qml/cppextensions/plugins/plugins.pro8
3 files changed, 8 insertions, 7 deletions
diff --git a/examples/qml/cppextensions/plugins/plugin.cpp b/examples/qml/cppextensions/plugins/plugin.cpp
index b53ef2ccb3..5e9900cb4f 100644
--- a/examples/qml/cppextensions/plugins/plugin.cpp
+++ b/examples/qml/cppextensions/plugins/plugin.cpp
@@ -141,6 +141,8 @@ MinuteTimer *TimeModel::timer=0;
class QExampleQmlPlugin : public QQmlExtensionPlugin
{
Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json")
+
public:
void registerTypes(const char *uri)
{
@@ -151,7 +153,3 @@ public:
//![plugin]
#include "plugin.moc"
-
-//![export]
-Q_EXPORT_PLUGIN2(qmlqtimeexampleplugin, QExampleQmlPlugin);
-//![export]
diff --git a/examples/qml/cppextensions/plugins/plugin.json b/examples/qml/cppextensions/plugins/plugin.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/examples/qml/cppextensions/plugins/plugin.json
@@ -0,0 +1 @@
+{}
diff --git a/examples/qml/cppextensions/plugins/plugins.pro b/examples/qml/cppextensions/plugins/plugins.pro
index e6c7fe64a0..08a4d1a61c 100644
--- a/examples/qml/cppextensions/plugins/plugins.pro
+++ b/examples/qml/cppextensions/plugins/plugins.pro
@@ -7,7 +7,9 @@ TARGET = qmlqtimeexampleplugin
SOURCES += plugin.cpp
-qqmlsources.files += \
+OTHER_FILES += "plugin.json"
+
+qdeclarativesources.files += \
com/nokia/TimeExample/qmldir \
com/nokia/TimeExample/center.png \
com/nokia/TimeExample/clock.png \
@@ -15,11 +17,11 @@ qqmlsources.files += \
com/nokia/TimeExample/hour.png \
com/nokia/TimeExample/minute.png
-qqmlsources.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/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/qml/plugins
target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qml/plugins/com/nokia/TimeExample
-INSTALLS += qqmlsources sources target
+INSTALLS += qdeclarativesources sources target