diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2012-09-26 15:12:37 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2012-09-27 09:49:50 +0200 |
| commit | 715e16ead4e727eb722f6eac9f22d771b835e14a (patch) | |
| tree | 4f90225a3b9a54e5b90a1a9d7d4e3d6f5f9e029e /src/plugins/qmldesigner/qtquickplugin | |
| parent | 1bd47955241c6680bd59240f02551c3e78362632 (diff) | |
QmlDesigner: fixing itemlibrary plugins for Qt 5
Adding the .json file and using the correct macro.
Change-Id: I37bede5b4c4a5af002b39b614aeb6c166bd5ddda
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
(cherry picked from commit a42eeecffa4e4b27772d91f98045ab45c5e0c3ed)
Diffstat (limited to 'src/plugins/qmldesigner/qtquickplugin')
3 files changed, 24 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp index dc389405634..fadeb5a2c47 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp @@ -56,5 +56,7 @@ QString QtQuickPlugin::metaInfo() const } +#if QT_VERSION < 0x050000 Q_EXPORT_PLUGIN(QmlDesigner::QtQuickPlugin) +#endif diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h index aee3bf98c5b..bb0dfbc04b4 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h @@ -42,6 +42,9 @@ namespace QmlDesigner { class QtQuickPlugin : public QObject, QmlDesigner::IWidgetPlugin { Q_OBJECT +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QmlDesignerPlugin" FILE "qtquickplugin.json") +#endif Q_DISABLE_COPY(QtQuickPlugin) Q_INTERFACES(QmlDesigner::IWidgetPlugin) public: diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.json b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.json new file mode 100644 index 00000000000..b4b0cded32c --- /dev/null +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.json @@ -0,0 +1,19 @@ +{ + + +"Vendor" : "Nokia Corporation", + + + + +"Category" : "Qt Quick", + + +"Description" : "Plugin for Qt Quick Items.", + + +"Url" : "http://www.qt-project.org" + + + +}
\ No newline at end of file |