summaryrefslogtreecommitdiffstats
path: root/examples/sensors/grue
diff options
context:
space:
mode:
authorLincoln Ramsay <lincoln.ramsay@nokia.com>2012-03-16 18:00:39 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-16 17:06:02 +0100
commit553d9c8cf7e37ba425d21da87062e21512a76b2e (patch)
treebcb94c0ff6da7a62c6ba5d4f0c2ad6b7e9bcb3a6 /examples/sensors/grue
parent8d25a4a58c47431c589d8cbbc82e442360cf7e63 (diff)
Update QML plugins to the new style.
Change-Id: Ie419b58c4789e539be5370dc0b7d2518009bbe91 Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
Diffstat (limited to 'examples/sensors/grue')
-rw-r--r--examples/sensors/grue/import/import.pro3
-rw-r--r--examples/sensors/grue/import/main.cpp4
-rw-r--r--examples/sensors/grue/import/plugin.json1
3 files changed, 5 insertions, 3 deletions
diff --git a/examples/sensors/grue/import/import.pro b/examples/sensors/grue/import/import.pro
index e6816364..a689931b 100644
--- a/examples/sensors/grue/import/import.pro
+++ b/examples/sensors/grue/import/import.pro
@@ -22,3 +22,6 @@ INSTALLS += target
qmldir.files=$$PWD/qmldir
qmldir.path=$$DESTPATH
INSTALLS += qmldir
+
+OTHER_FILES += \
+ plugin.json
diff --git a/examples/sensors/grue/import/main.cpp b/examples/sensors/grue/import/main.cpp
index 9b14fdda..4924bde7 100644
--- a/examples/sensors/grue/import/main.cpp
+++ b/examples/sensors/grue/import/main.cpp
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
class GrueSensorQmlImport : public QQmlExtensionPlugin
{
Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json")
public:
virtual void registerTypes(const char *uri)
{
@@ -68,8 +69,6 @@ QT_END_NAMESPACE
#include "main.moc"
-Q_EXPORT_PLUGIN2(gruesensorqmlimport, QT_PREPEND_NAMESPACE(GrueSensorQmlImport));
-
/*
\qmlclass GrueSensor GrueSensor
\inherits QtMobility.sensors1::Sensor
@@ -102,4 +101,3 @@ Q_EXPORT_PLUGIN2(gruesensorqmlimport, QT_PREPEND_NAMESPACE(GrueSensorQmlImport))
\qmlproperty qreal Grue1::GrueSensorReading::chanceOfBeingEaten
Please see GrueSensorReading::chanceOfBeingEaten for information about this property.
*/
-
diff --git a/examples/sensors/grue/import/plugin.json b/examples/sensors/grue/import/plugin.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/examples/sensors/grue/import/plugin.json
@@ -0,0 +1 @@
+{}