Use new plugin system in Qt Designer.

- Change interface names to use the prefix "org.qt-project.Qt."
- Add json files and use new macros.

Change-Id: I2b0e6ac59b6dfbdced70751921a588f6e417615f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

15 files changed, 12 insertions, 17 deletions

diff --git a/examples/designer/containerextension/containerextension.pro b/examples/designer/containerextension/containerextension.pro
index add7e4402..fe727670e 100644
--- a/examples/designer/containerextension/containerextension.pro
+++ b/examples/designer/containerextension/containerextension.pro
@@ -18,6 +18,8 @@ SOURCES += multipagewidget.cpp \
            multipagewidgetplugin.cpp \
            multipagewidgetcontainerextension.cpp \
            multipagewidgetextensionfactory.cpp 
+
+OTHER_FILES += multipagewidget.json
 #! [2]
 
 # install
diff --git a/examples/designer/containerextension/multipagewidget.json b/examples/designer/containerextension/multipagewidget.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/examples/designer/containerextension/multipagewidget.json
@@ -0,0 +1 @@
+{}
diff --git a/examples/designer/containerextension/multipagewidgetplugin.cpp b/examples/designer/containerextension/multipagewidgetplugin.cpp
index b709ca591..2dbb4cb68 100644
--- a/examples/designer/containerextension/multipagewidgetplugin.cpp
+++ b/examples/designer/containerextension/multipagewidgetplugin.cpp
@@ -190,7 +190,3 @@ void MultiPageWidgetPlugin::pageTitleChanged(const QString &title)
 }
 
 //! [13]
-
-//! [14]
-Q_EXPORT_PLUGIN2(containerextension, MultiPageWidgetPlugin)
-//! [14]
diff --git a/examples/designer/containerextension/multipagewidgetplugin.h b/examples/designer/containerextension/multipagewidgetplugin.h
index d37631841..c68c52db0 100644
--- a/examples/designer/containerextension/multipagewidgetplugin.h
+++ b/examples/designer/containerextension/multipagewidgetplugin.h
@@ -52,6 +52,7 @@ QT_END_NAMESPACE
 class MultiPageWidgetPlugin: public QObject, public QDesignerCustomWidgetInterface
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidget" FILE "multipagewidget.json")
     Q_INTERFACES(QDesignerCustomWidgetInterface)
 public:
     MultiPageWidgetPlugin(QObject *parent = 0);
diff --git a/examples/designer/customwidgetplugin/analogclock.json b/examples/designer/customwidgetplugin/analogclock.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/examples/designer/customwidgetplugin/analogclock.json
@@ -0,0 +1 @@
+{}
diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.cpp b/examples/designer/customwidgetplugin/customwidgetplugin.cpp
index 3494ac54b..d5e468ce4 100644
--- a/examples/designer/customwidgetplugin/customwidgetplugin.cpp
+++ b/examples/designer/customwidgetplugin/customwidgetplugin.cpp
@@ -149,7 +149,3 @@ QString AnalogClockPlugin::includeFile() const
     return "analogclock.h";
 }
 //! [12]
-
-//! [13]
-Q_EXPORT_PLUGIN2(customwidgetplugin, AnalogClockPlugin)
-//! [13]
diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.h b/examples/designer/customwidgetplugin/customwidgetplugin.h
index f1f82d379..781983dff 100644
--- a/examples/designer/customwidgetplugin/customwidgetplugin.h
+++ b/examples/designer/customwidgetplugin/customwidgetplugin.h
@@ -47,8 +47,8 @@
 class AnalogClockPlugin : public QObject, public QDesignerCustomWidgetInterface
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface" FILE "analogclock.json")
     Q_INTERFACES(QDesignerCustomWidgetInterface)
-
 public:
     AnalogClockPlugin(QObject *parent = 0);
 
diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.pro b/examples/designer/customwidgetplugin/customwidgetplugin.pro
index 76c22bbd0..feb8689a7 100644
--- a/examples/designer/customwidgetplugin/customwidgetplugin.pro
+++ b/examples/designer/customwidgetplugin/customwidgetplugin.pro
@@ -13,6 +13,7 @@ HEADERS     = analogclock.h \
               customwidgetplugin.h
 SOURCES     = analogclock.cpp \
               customwidgetplugin.cpp
+OTHER_FILES += analogclock.json
 #! [3]
 
 # install
diff --git a/examples/designer/taskmenuextension/taskmenuextension.pro b/examples/designer/taskmenuextension/taskmenuextension.pro
index fbc57f464..46a193f3a 100644
--- a/examples/designer/taskmenuextension/taskmenuextension.pro
+++ b/examples/designer/taskmenuextension/taskmenuextension.pro
@@ -17,6 +17,7 @@ SOURCES += tictactoe.cpp \
            tictactoedialog.cpp \
            tictactoeplugin.cpp \
            tictactoetaskmenu.cpp
+OTHER_FILES += tictactoe.json
 #! [2]
 
 # install
diff --git a/examples/designer/taskmenuextension/tictactoe.json b/examples/designer/taskmenuextension/tictactoe.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/examples/designer/taskmenuextension/tictactoe.json
@@ -0,0 +1 @@
+{}
diff --git a/examples/designer/taskmenuextension/tictactoeplugin.cpp b/examples/designer/taskmenuextension/tictactoeplugin.cpp
index b71b176eb..ef5690ec1 100644
--- a/examples/designer/taskmenuextension/tictactoeplugin.cpp
+++ b/examples/designer/taskmenuextension/tictactoeplugin.cpp
@@ -135,7 +135,3 @@ QString TicTacToePlugin::domXml() const
 }
 
 //! [3]
-
-//! [4]
-Q_EXPORT_PLUGIN2(taskmenuextension, TicTacToePlugin)
-//! [4]
diff --git a/examples/designer/taskmenuextension/tictactoeplugin.h b/examples/designer/taskmenuextension/tictactoeplugin.h
index 613c5a923..92794a3bd 100644
--- a/examples/designer/taskmenuextension/tictactoeplugin.h
+++ b/examples/designer/taskmenuextension/tictactoeplugin.h
@@ -52,6 +52,7 @@ QT_END_NAMESPACE
 class TicTacToePlugin : public QObject, public QDesignerCustomWidgetInterface
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface" FILE "tictactoe.json")
     Q_INTERFACES(QDesignerCustomWidgetInterface)
 
 public:
diff --git a/examples/designer/worldtimeclockplugin/worldtimeclock.json b/examples/designer/worldtimeclockplugin/worldtimeclock.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/examples/designer/worldtimeclockplugin/worldtimeclock.json
@@ -0,0 +1 @@
+{}
diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp
index 0b24eb11b..581483c42 100644
--- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp
+++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.cpp
@@ -117,7 +117,3 @@ QString WorldTimeClockPlugin::includeFile() const
 {
     return "worldtimeclock.h";
 }
-
-//! [0]
-Q_EXPORT_PLUGIN2(worldtimeclockplugin, WorldTimeClockPlugin)
-//! [0]
diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h
index fb208467f..341db18a4 100644
--- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h
+++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.h
@@ -48,6 +48,7 @@ class WorldTimeClockPlugin : public QObject,
                              public QDesignerCustomWidgetInterface
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface" FILE "worldtimeclock.json")
     Q_INTERFACES(QDesignerCustomWidgetInterface)
 
 public: