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>

src/plugins/qmldesigner/customstyleplugin/customstyleplugin.cpp

@@ -51,5 +51,7 @@ QString CustomStylePlugin::metaInfo() const
 
 }
 
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN(QmlDesigner::CustomStylePlugin)
+#endif
 

src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h

@@ -38,6 +38,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:

src/plugins/qmldesigner/customstyleplugin/customstyleplugin.json

+{
+
+
+"Vendor" : "Nokia Corporation",
+
+
+
+
+"Category" : "Qt Quick",
+
+
+"Description" : "Plugin for Custom Style Items.",
+
+
+"Url" : "http://www.qt-project.org"
+
+
+
+}
\ No newline at end of file

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

src/plugins/qmldesigner/desktopplugin/desktopplugin.cpp

@@ -51,5 +51,7 @@ QString DesktopPlugin::metaInfo() const
 
 }
 
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN(QmlDesigner::DesktopPlugin)
+#endif
 

src/plugins/qmldesigner/desktopplugin/desktopplugin.h

@@ -41,6 +41,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:

src/plugins/qmldesigner/desktopplugin/desktopplugin.json

+{
+
+
+"Vendor" : "Nokia Corporation",
+
+
+
+
+"Category" : "Qt Quick",
+
+
+"Description" : "Plugin for Desktop Items.",
+
+
+"Url" : "http://www.qt-project.org"
+
+
+
+}
\ No newline at end of file

src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp

@@ -51,5 +51,7 @@ QString ExtrasPlugin::metaInfo() const
 
 }
 
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN(QmlDesigner::ExtrasPlugin)
+#endif
 

src/plugins/qmldesigner/extrasplugin/extrasplugin.h

@@ -38,6 +38,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:

src/plugins/qmldesigner/extrasplugin/extrasplugin.json

+{
+
+
+"Vendor" : "Nokia Corporation",
+
+
+
+
+"Category" : "Qt Quick",
+
+
+"Description" : "Plugin for Extra Items.",
+
+
+"Url" : "http://www.qt-project.org"
+
+
+
+}
\ No newline at end of file

src/plugins/qmldesigner/meegoplugin/meegoplugin.cpp

@@ -51,5 +51,7 @@ QString MeegoPlugin::metaInfo() const
 
 }
 
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN(QmlDesigner::MeegoPlugin)
+#endif
 

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:

src/plugins/qmldesigner/meegoplugin/meegoplugin.json

+{
+
+
+"Vendor" : "Nokia Corporation",
+
+
+
+
+"Category" : "Qt Quick",
+
+
+"Description" : "Plugin for Meego Items.",
+
+
+"Url" : "http://www.qt-project.org"
+
+
+
+}
\ No newline at end of file

src/plugins/qmldesigner/meegoplugin/qtquickplugin.json

+{
+
+
+"Vendor" : "Nokia Corporation",
+
+
+
+
+"Category" : "Qt Quick",
+
+
+"Description" : "Plugin for Qt Quick Items.",
+
+
+"Url" : "http://www.qt-project.org"
+
+
+
+}
\ No newline at end of file

src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp

@@ -52,5 +52,7 @@ QString QtQuickPlugin::metaInfo() const
 
 }
 
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN(QmlDesigner::QtQuickPlugin)
+#endif
 

src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h

@@ -41,6 +41,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:

src/plugins/qmldesigner/qtquickplugin/qtquickplugin.json

+{
+
+
+"Vendor" : "Nokia Corporation",
+
+
+
+
+"Category" : "Qt Quick",
+
+
+"Description" : "Plugin for Qt Quick Items.",
+
+
+"Url" : "http://www.qt-project.org"
+
+
+
+}
\ No newline at end of file