diff options
author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-03-16 18:00:39 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-16 17:06:02 +0100 |
commit | 553d9c8cf7e37ba425d21da87062e21512a76b2e (patch) | |
tree | bcb94c0ff6da7a62c6ba5d4f0c2ad6b7e9bcb3a6 | |
parent | 8d25a4a58c47431c589d8cbbc82e442360cf7e63 (diff) |
Update QML plugins to the new style.
Change-Id: Ie419b58c4789e539be5370dc0b7d2518009bbe91
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
-rw-r--r-- | examples/sensors/grue/import/import.pro | 3 | ||||
-rw-r--r-- | examples/sensors/grue/import/main.cpp | 4 | ||||
-rw-r--r-- | examples/sensors/grue/import/plugin.json | 1 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/import/import.pro | 3 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/import/main.cpp | 3 | ||||
-rw-r--r-- | examples/sensors/sensor_explorer/import/plugin.json | 1 | ||||
-rw-r--r-- | src/imports/sensors/plugin.json | 1 | ||||
-rw-r--r-- | src/imports/sensors/sensors.cpp | 3 | ||||
-rw-r--r-- | src/imports/sensors/sensors.pro | 3 | ||||
-rw-r--r-- | src/imports/sensors2/plugin.json | 1 | ||||
-rw-r--r-- | src/imports/sensors2/sensors2.cpp | 5 | ||||
-rw-r--r-- | src/imports/sensors2/sensors2.pro | 3 |
12 files changed, 20 insertions, 11 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 @@ +{} diff --git a/examples/sensors/sensor_explorer/import/import.pro b/examples/sensors/sensor_explorer/import/import.pro index e84ede02..175433e6 100644 --- a/examples/sensors/sensor_explorer/import/import.pro +++ b/examples/sensors/sensor_explorer/import/import.pro @@ -20,3 +20,6 @@ INSTALLS += target qmldir.files=$$PWD/qmldir qmldir.path=$$DESTPATH INSTALLS += qmldir + +OTHER_FILES += \ + plugin.json diff --git a/examples/sensors/sensor_explorer/import/main.cpp b/examples/sensors/sensor_explorer/import/main.cpp index 42914863..e0b3ad99 100644 --- a/examples/sensors/sensor_explorer/import/main.cpp +++ b/examples/sensors/sensor_explorer/import/main.cpp @@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE class SensorExplorerDeclarativeModule : public QQmlExtensionPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") public: virtual void registerTypes(const char *uri) { @@ -63,5 +64,3 @@ public: QT_END_NAMESPACE #include "main.moc" - -Q_EXPORT_PLUGIN2(sensorexplorerdeclarativemodule, QT_PREPEND_NAMESPACE(SensorExplorerDeclarativeModule)) diff --git a/examples/sensors/sensor_explorer/import/plugin.json b/examples/sensors/sensor_explorer/import/plugin.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/examples/sensors/sensor_explorer/import/plugin.json @@ -0,0 +1 @@ +{} diff --git a/src/imports/sensors/plugin.json b/src/imports/sensors/plugin.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/src/imports/sensors/plugin.json @@ -0,0 +1 @@ +{} diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp index 36b7d94a..4943d172 100644 --- a/src/imports/sensors/sensors.cpp +++ b/src/imports/sensors/sensors.cpp @@ -97,6 +97,7 @@ int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMin class QSensorsDeclarativeModule : public QQmlExtensionPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") public: virtual void registerTypes(const char *uri) { @@ -186,8 +187,6 @@ QT_END_NAMESPACE #include "sensors.moc" -Q_EXPORT_PLUGIN2(qsensorsdeclarativemodule, QT_PREPEND_NAMESPACE(QSensorsDeclarativeModule)); - // ===================================================================== /*! diff --git a/src/imports/sensors/sensors.pro b/src/imports/sensors/sensors.pro index 35aa3c54..8f60d6c8 100644 --- a/src/imports/sensors/sensors.pro +++ b/src/imports/sensors/sensors.pro @@ -28,3 +28,6 @@ symbian { DEPLOYMENT = importFiles } +OTHER_FILES += \ + plugin.json + diff --git a/src/imports/sensors2/plugin.json b/src/imports/sensors2/plugin.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/src/imports/sensors2/plugin.json @@ -0,0 +1 @@ +{} diff --git a/src/imports/sensors2/sensors2.cpp b/src/imports/sensors2/sensors2.cpp index 5570aaa1..ebcefcfb 100644 --- a/src/imports/sensors2/sensors2.cpp +++ b/src/imports/sensors2/sensors2.cpp @@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE class QSensors2DeclarativeModule : public QQmlExtensionPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") public: virtual void registerTypes(const char *uri) { @@ -69,7 +70,3 @@ public: QT_END_NAMESPACE #include "sensors2.moc" - -Q_EXPORT_PLUGIN2(qsensors2declarativemodule, QT_PREPEND_NAMESPACE(QSensors2DeclarativeModule)) - - diff --git a/src/imports/sensors2/sensors2.pro b/src/imports/sensors2/sensors2.pro index 49f704c2..91c0bc0b 100644 --- a/src/imports/sensors2/sensors2.pro +++ b/src/imports/sensors2/sensors2.pro @@ -38,3 +38,6 @@ symbian { importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH DEPLOYMENT = importFiles } + +OTHER_FILES += \ + plugin.json |