diff options
| author | Xizhi Zhu <xizhi.zhu@nokia.com> | 2012-03-13 16:13:37 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-19 20:44:59 +0100 |
| commit | a08ea127143e3af2cd8b04730841176a06480404 (patch) | |
| tree | 07c87c343d11403aea52d2bf24762793a26f5335 /src/imports | |
| parent | b7f419b64df2dfd2ebed1f29d3e75c88a7deb885 (diff) | |
Adapt to new plugin mechanism.
Change-Id: I59ca96e896eda8fa86ca9e51a3eae452272d6e89
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/publishsubscribe/publishsubscribe.cpp | 5 | ||||
| -rw-r--r-- | src/imports/publishsubscribe/publishsubscribe.json | 1 | ||||
| -rw-r--r-- | src/imports/serviceframework/serviceframework.cpp | 4 | ||||
| -rw-r--r-- | src/imports/serviceframework/serviceframework.json | 1 | ||||
| -rw-r--r-- | src/imports/systeminfo/qsysteminfo.cpp | 3 | ||||
| -rw-r--r-- | src/imports/systeminfo/systeminfo.json | 1 |
6 files changed, 7 insertions, 8 deletions
diff --git a/src/imports/publishsubscribe/publishsubscribe.cpp b/src/imports/publishsubscribe/publishsubscribe.cpp index 59c5e108..b09ec402 100644 --- a/src/imports/publishsubscribe/publishsubscribe.cpp +++ b/src/imports/publishsubscribe/publishsubscribe.cpp @@ -50,6 +50,8 @@ QT_BEGIN_NAMESPACE class QSubscriberDeclarativeModule : public QQmlExtensionPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "publishsubscribe.json") + public: virtual void registerTypes(const char *uri) { @@ -65,6 +67,3 @@ public: QT_END_NAMESPACE #include "publishsubscribe.moc" - -Q_EXPORT_PLUGIN2(qsubscriberdeclarativemodule, QT_PREPEND_NAMESPACE(QSubscriberDeclarativeModule)) - diff --git a/src/imports/publishsubscribe/publishsubscribe.json b/src/imports/publishsubscribe/publishsubscribe.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/src/imports/publishsubscribe/publishsubscribe.json @@ -0,0 +1 @@ +{} diff --git a/src/imports/serviceframework/serviceframework.cpp b/src/imports/serviceframework/serviceframework.cpp index 10bdd13b..200a48e5 100644 --- a/src/imports/serviceframework/serviceframework.cpp +++ b/src/imports/serviceframework/serviceframework.cpp @@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE class QServiceDeclarativeModule : public QQmlExtensionPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "serviceframework.json") public: virtual void registerTypes(const char *uri) @@ -67,6 +68,3 @@ public: QT_END_NAMESPACE #include "serviceframework.moc" - -Q_EXPORT_PLUGIN2(qservicedeclarativemodule, QT_PREPEND_NAMESPACE(QServiceDeclarativeModule)); - diff --git a/src/imports/serviceframework/serviceframework.json b/src/imports/serviceframework/serviceframework.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/src/imports/serviceframework/serviceframework.json @@ -0,0 +1 @@ +{} diff --git a/src/imports/systeminfo/qsysteminfo.cpp b/src/imports/systeminfo/qsysteminfo.cpp index 32639aa4..4bbe8822 100644 --- a/src/imports/systeminfo/qsysteminfo.cpp +++ b/src/imports/systeminfo/qsysteminfo.cpp @@ -55,6 +55,7 @@ QT_BEGIN_NAMESPACE class QSystemInfoDeclarativeModule : public QQmlExtensionPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "systeminfo.json") public: virtual void registerTypes(const char *uri) @@ -77,8 +78,6 @@ QT_END_NAMESPACE #include "qsysteminfo.moc" -Q_EXPORT_PLUGIN2(qsysteminfodeclarativemodule, QT_PREPEND_NAMESPACE(QSystemInfoDeclarativeModule)) - /*! \qmlclass ScreenSaver QScreenSaver \inqmlmodule QtSystemInfo diff --git a/src/imports/systeminfo/systeminfo.json b/src/imports/systeminfo/systeminfo.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/src/imports/systeminfo/systeminfo.json @@ -0,0 +1 @@ +{} |