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 | |
parent | 1bd47955241c6680bd59240f02551c3e78362632 (diff) | |
download | qt-creator-715e16ead4e727eb722f6eac9f22d771b835e14a.tar.gz |
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')
17 files changed, 139 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.cpp b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.cpp index 2f7fdab42b..90163ae82c 100644 --- a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.cpp +++ b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.cpp @@ -51,5 +51,7 @@ QString CustomStylePlugin::metaInfo() const } +#if QT_VERSION < 0x050000 Q_EXPORT_PLUGIN(QmlDesigner::CustomStylePlugin) +#endif diff --git a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h index 5eeea72e8b..4c35239287 100644 --- a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h +++ b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h @@ -39,6 +39,9 @@ namespace QmlDesigner { class CustomStylePlugin : public QObject, QmlDesigner::IWidgetPlugin { Q_OBJECT +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QmlDesignerPlugin" FILE "customstyleplugin.json") +#endif Q_INTERFACES(QmlDesigner::IWidgetPlugin) public: diff --git a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.json b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.json new file mode 100644 index 0000000000..5238b0e4ef --- /dev/null +++ b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.json @@ -0,0 +1,19 @@ +{ + + +"Vendor" : "Nokia Corporation", + + + + +"Category" : "Qt Quick", + + +"Description" : "Plugin for Custom Style Items.", + + +"Url" : "http://www.qt-project.org" + + + +}
\ No newline at end of file diff --git a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri index 3d857270a4..3e30ea983e 100644 --- a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri +++ b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri @@ -2,9 +2,6 @@ TARGET = customstyleplugin TEMPLATE = lib CONFIG += plugin -QT += script \ - declarative - include (../designercore/iwidgetplugin.pri) SOURCES += $$PWD/customstyleplugin.cpp diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp b/src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp index 61080f818c..ed5e91b729 100644 --- a/src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp +++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp @@ -51,5 +51,7 @@ QString DesktopPlugin::metaInfo() const } +#if QT_VERSION < 0x050000 Q_EXPORT_PLUGIN(QmlDesigner::DesktopPlugin) +#endif diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.h b/src/plugins/qmldesigner/desktopplugin/desktopplugin.h index 0188d5d010..3d649ede77 100644 --- a/src/plugins/qmldesigner/desktopplugin/desktopplugin.h +++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.h @@ -42,6 +42,9 @@ namespace QmlDesigner { class DesktopPlugin : public QObject, QmlDesigner::IWidgetPlugin { Q_OBJECT +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QmlDesignerPlugin" FILE "desktopplugin.json") +#endif Q_INTERFACES(QmlDesigner::IWidgetPlugin) public: diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.json b/src/plugins/qmldesigner/desktopplugin/desktopplugin.json new file mode 100644 index 0000000000..bc4b4403a5 --- /dev/null +++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.json @@ -0,0 +1,19 @@ +{ + + +"Vendor" : "Nokia Corporation", + + + + +"Category" : "Qt Quick", + + +"Description" : "Plugin for Desktop Items.", + + +"Url" : "http://www.qt-project.org" + + + +}
\ No newline at end of file diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp b/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp index 2d9cc7442d..3904973afe 100644 --- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp @@ -51,5 +51,7 @@ QString ExtrasPlugin::metaInfo() const } +#if QT_VERSION < 0x050000 Q_EXPORT_PLUGIN(QmlDesigner::ExtrasPlugin) +#endif diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.h b/src/plugins/qmldesigner/extrasplugin/extrasplugin.h index 8b8b011d0b..8ee1c61c4b 100644 --- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.h +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.h @@ -39,6 +39,9 @@ namespace QmlDesigner { class ExtrasPlugin : public QObject, QmlDesigner::IWidgetPlugin { Q_OBJECT +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QmlDesignerPlugin" FILE "extrasplugin.json") +#endif Q_INTERFACES(QmlDesigner::IWidgetPlugin) public: diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.json b/src/plugins/qmldesigner/extrasplugin/extrasplugin.json new file mode 100644 index 0000000000..e56eadab34 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.json @@ -0,0 +1,19 @@ +{ + + +"Vendor" : "Nokia Corporation", + + + + +"Category" : "Qt Quick", + + +"Description" : "Plugin for Extra Items.", + + +"Url" : "http://www.qt-project.org" + + + +}
\ No newline at end of file diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.cpp b/src/plugins/qmldesigner/meegoplugin/meegoplugin.cpp index ff4ddc13cb..552d7e4bbd 100644 --- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.cpp +++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.cpp @@ -51,5 +51,7 @@ QString MeegoPlugin::metaInfo() const } +#if QT_VERSION < 0x050000 Q_EXPORT_PLUGIN(QmlDesigner::MeegoPlugin) +#endif diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.h b/src/plugins/qmldesigner/meegoplugin/meegoplugin.h index 5e82b17e76..2738641474 100644 --- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.h +++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.h @@ -38,6 +38,9 @@ namespace QmlDesigner { class MeegoPlugin : public QObject, QmlDesigner::IWidgetPlugin { Q_OBJECT +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QmlDesignerPlugin" FILE "meegoplugin.json") +#endif Q_INTERFACES(QmlDesigner::IWidgetPlugin) public: diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.json b/src/plugins/qmldesigner/meegoplugin/meegoplugin.json new file mode 100644 index 0000000000..badb15b4d4 --- /dev/null +++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.json @@ -0,0 +1,19 @@ +{ + + +"Vendor" : "Nokia Corporation", + + + + +"Category" : "Qt Quick", + + +"Description" : "Plugin for Meego Items.", + + +"Url" : "http://www.qt-project.org" + + + +}
\ No newline at end of file diff --git a/src/plugins/qmldesigner/meegoplugin/qtquickplugin.json b/src/plugins/qmldesigner/meegoplugin/qtquickplugin.json new file mode 100644 index 0000000000..b4b0cded32 --- /dev/null +++ b/src/plugins/qmldesigner/meegoplugin/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 diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp index dc38940563..fadeb5a2c4 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 aee3bf98c5..bb0dfbc04b 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 0000000000..b4b0cded32 --- /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 |