diff --git a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.cpp b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.cpp index 2f7fdab42be8cda1adb7dd165accbbf20634ed69..90163ae82cfec2bfd43d1c6b54a84eed7b766ab5 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 6c8d268b41ab1b4ad045e79c51998af0a432b965..7372b095eb286e2fedf391673b0bbaca03e3de6e 100644 --- a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.h +++ b/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: diff --git a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.json b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.json new file mode 100644 index 0000000000000000000000000000000000000000..5238b0e4efbf05e53ddd25a2704582dab78794b1 --- /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 3d857270a4a819a2221fe23449720a9f2acb3d91..3e30ea983e75f4a7284e093cc691eb8de081803c 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 61080f818c32036ea4a0155ced396b4c5070bf83..ed5e91b7290a32561be932748ea0f2bc4e4b9044 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 5aba4cd7b0d2d86953a30f1cb3997eb36959a7e2..bf3e4e85fe2ece05b1a6a16ad9f25ad1c6c9333f 100644 --- a/src/plugins/qmldesigner/desktopplugin/desktopplugin.h +++ b/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: diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.json b/src/plugins/qmldesigner/desktopplugin/desktopplugin.json new file mode 100644 index 0000000000000000000000000000000000000000..bc4b4403a5467ce69a23157ca8ee95a45df6d884 --- /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 2d9cc7442dc4b372eef7e1d5d9c3f6da3266a9bd..3904973afee57a0a152cc229e30b320819f831af 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 19c75209415b0356fd2e00c4f804eaeeb5be1f07..7346f48e73b1bebba11e10902ef92e8af110a277 100644 --- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.h +++ b/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: diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.json b/src/plugins/qmldesigner/extrasplugin/extrasplugin.json new file mode 100644 index 0000000000000000000000000000000000000000..e56eadab3412f7ff77d4dfad4d43d08aa029752f --- /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 ff4ddc13cbc78d26613bef057f0dce6d3435c256..552d7e4bbd7a8b09c12405dc535b709b3ade305f 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 5e82b17e76267e56f98bab72b360af520d35a599..2738641474f1b94b9ad4f9b8b3c94a8114d016c5 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 0000000000000000000000000000000000000000..badb15b4d4253c12a36724100c62aa87d987ba11 --- /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 0000000000000000000000000000000000000000..b4b0cded32c622ddc1b446f81499737b768bb5f9 --- /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 5aea7bca6b44080fa9bf186676852670bb156709..e3aae5b4fc072fe699780b2996a3a50c90375ae9 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp @@ -52,5 +52,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 2301942cc653a5a3ba4c1a40e7612cf18ab1c83c..e9fb042502b5daab55b682dfcc96fc19c718bc22 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h +++ b/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: diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.json b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.json new file mode 100644 index 0000000000000000000000000000000000000000..b4b0cded32c622ddc1b446f81499737b768bb5f9 --- /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