Commit a42eeecf authored by Thomas Hartmann's avatar Thomas Hartmann

QmlDesigner: fixing itemlibrary plugins for Qt 5

Adding the .json file and using the correct macro.

Change-Id: I37bede5b4c4a5af002b39b614aeb6c166bd5ddda
Reviewed-by: default avatarMarco Bubke <marco.bubke@digia.com>
parent ad535b5b
...@@ -51,5 +51,7 @@ QString CustomStylePlugin::metaInfo() const ...@@ -51,5 +51,7 @@ QString CustomStylePlugin::metaInfo() const
} }
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN(QmlDesigner::CustomStylePlugin) Q_EXPORT_PLUGIN(QmlDesigner::CustomStylePlugin)
#endif
...@@ -38,6 +38,9 @@ namespace QmlDesigner { ...@@ -38,6 +38,9 @@ namespace QmlDesigner {
class CustomStylePlugin : public QObject, QmlDesigner::IWidgetPlugin class CustomStylePlugin : public QObject, QmlDesigner::IWidgetPlugin
{ {
Q_OBJECT Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QmlDesignerPlugin" FILE "customstyleplugin.json")
#endif
Q_INTERFACES(QmlDesigner::IWidgetPlugin) Q_INTERFACES(QmlDesigner::IWidgetPlugin)
public: public:
......
{
"Vendor" : "Nokia Corporation",
"Category" : "Qt Quick",
"Description" : "Plugin for Custom Style Items.",
"Url" : "http://www.qt-project.org"
}
\ No newline at end of file
...@@ -2,9 +2,6 @@ TARGET = customstyleplugin ...@@ -2,9 +2,6 @@ TARGET = customstyleplugin
TEMPLATE = lib TEMPLATE = lib
CONFIG += plugin CONFIG += plugin
QT += script \
declarative
include (../designercore/iwidgetplugin.pri) include (../designercore/iwidgetplugin.pri)
SOURCES += $$PWD/customstyleplugin.cpp SOURCES += $$PWD/customstyleplugin.cpp
......
...@@ -51,5 +51,7 @@ QString DesktopPlugin::metaInfo() const ...@@ -51,5 +51,7 @@ QString DesktopPlugin::metaInfo() const
} }
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN(QmlDesigner::DesktopPlugin) Q_EXPORT_PLUGIN(QmlDesigner::DesktopPlugin)
#endif
...@@ -41,6 +41,9 @@ namespace QmlDesigner { ...@@ -41,6 +41,9 @@ namespace QmlDesigner {
class DesktopPlugin : public QObject, QmlDesigner::IWidgetPlugin class DesktopPlugin : public QObject, QmlDesigner::IWidgetPlugin
{ {
Q_OBJECT Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QmlDesignerPlugin" FILE "desktopplugin.json")
#endif
Q_INTERFACES(QmlDesigner::IWidgetPlugin) Q_INTERFACES(QmlDesigner::IWidgetPlugin)
public: public:
......
{
"Vendor" : "Nokia Corporation",
"Category" : "Qt Quick",
"Description" : "Plugin for Desktop Items.",
"Url" : "http://www.qt-project.org"
}
\ No newline at end of file
...@@ -51,5 +51,7 @@ QString ExtrasPlugin::metaInfo() const ...@@ -51,5 +51,7 @@ QString ExtrasPlugin::metaInfo() const
} }
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN(QmlDesigner::ExtrasPlugin) Q_EXPORT_PLUGIN(QmlDesigner::ExtrasPlugin)
#endif
...@@ -38,6 +38,9 @@ namespace QmlDesigner { ...@@ -38,6 +38,9 @@ namespace QmlDesigner {
class ExtrasPlugin : public QObject, QmlDesigner::IWidgetPlugin class ExtrasPlugin : public QObject, QmlDesigner::IWidgetPlugin
{ {
Q_OBJECT Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QmlDesignerPlugin" FILE "extrasplugin.json")
#endif
Q_INTERFACES(QmlDesigner::IWidgetPlugin) Q_INTERFACES(QmlDesigner::IWidgetPlugin)
public: public:
......
{
"Vendor" : "Nokia Corporation",
"Category" : "Qt Quick",
"Description" : "Plugin for Extra Items.",
"Url" : "http://www.qt-project.org"
}
\ No newline at end of file
...@@ -51,5 +51,7 @@ QString MeegoPlugin::metaInfo() const ...@@ -51,5 +51,7 @@ QString MeegoPlugin::metaInfo() const
} }
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN(QmlDesigner::MeegoPlugin) Q_EXPORT_PLUGIN(QmlDesigner::MeegoPlugin)
#endif
...@@ -38,6 +38,9 @@ namespace QmlDesigner { ...@@ -38,6 +38,9 @@ namespace QmlDesigner {
class MeegoPlugin : public QObject, QmlDesigner::IWidgetPlugin class MeegoPlugin : public QObject, QmlDesigner::IWidgetPlugin
{ {
Q_OBJECT Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QmlDesignerPlugin" FILE "meegoplugin.json")
#endif
Q_INTERFACES(QmlDesigner::IWidgetPlugin) Q_INTERFACES(QmlDesigner::IWidgetPlugin)
public: public:
......
{
"Vendor" : "Nokia Corporation",
"Category" : "Qt Quick",
"Description" : "Plugin for Meego Items.",
"Url" : "http://www.qt-project.org"
}
\ No newline at end of file
{
"Vendor" : "Nokia Corporation",
"Category" : "Qt Quick",
"Description" : "Plugin for Qt Quick Items.",
"Url" : "http://www.qt-project.org"
}
\ No newline at end of file
...@@ -52,5 +52,7 @@ QString QtQuickPlugin::metaInfo() const ...@@ -52,5 +52,7 @@ QString QtQuickPlugin::metaInfo() const
} }
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN(QmlDesigner::QtQuickPlugin) Q_EXPORT_PLUGIN(QmlDesigner::QtQuickPlugin)
#endif
...@@ -41,6 +41,9 @@ namespace QmlDesigner { ...@@ -41,6 +41,9 @@ namespace QmlDesigner {
class QtQuickPlugin : public QObject, QmlDesigner::IWidgetPlugin class QtQuickPlugin : public QObject, QmlDesigner::IWidgetPlugin
{ {
Q_OBJECT Q_OBJECT
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QmlDesignerPlugin" FILE "qtquickplugin.json")
#endif
Q_DISABLE_COPY(QtQuickPlugin) Q_DISABLE_COPY(QtQuickPlugin)
Q_INTERFACES(QmlDesigner::IWidgetPlugin) Q_INTERFACES(QmlDesigner::IWidgetPlugin)
public: public:
......
{
"Vendor" : "Nokia Corporation",
"Category" : "Qt Quick",
"Description" : "Plugin for Qt Quick Items.",
"Url" : "http://www.qt-project.org"
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment