Use the new plugin system

Convert the last remaining three plugins over from
the old plugin system.

Change-Id: I355e6bb068ec4afb58a2ee9542f86e2913b3851d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/plugins/generic/meego/main.cpp b/src/plugins/generic/meego/main.cpp
index 83e0a6c..6a82bd8 100644 (file)
--- a/src/plugins/generic/meego/main.cpp
+++ b/src/plugins/generic/meego/main.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
 
 class QMeeGoIntegrationPlugin : public QGenericPlugin
 {
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface")
 public:
     QMeeGoIntegrationPlugin();
 
@@ -64,6 +65,4 @@ QObject* QMeeGoIntegrationPlugin::create(const QString &key, const QString &spec
     return 0;
 }
 
-Q_EXPORT_PLUGIN2(qmeegointegrationplugin, QMeeGoIntegrationPlugin)
-
 QT_END_NAMESPACE

diff --git a/src/plugins/platforms/linuxfb/main.cpp b/src/plugins/platforms/linuxfb/main.cpp
index 59a3864..4180d6b 100644 (file)
--- a/src/plugins/platforms/linuxfb/main.cpp
+++ b/src/plugins/platforms/linuxfb/main.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
 
 class QLinuxFbIntegrationPlugin : public QPlatformIntegrationPlugin
 {
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformIntegrationFactoryInterface")
 public:
     QPlatformIntegration *create(const QString&, const QStringList&);
 };
@@ -59,6 +60,4 @@ QPlatformIntegration* QLinuxFbIntegrationPlugin::create(const QString& system, c
     return 0;
 }
 
-Q_EXPORT_PLUGIN2(linuxfb, QLinuxFbIntegrationPlugin)
-
 QT_END_NAMESPACE

diff --git a/src/plugins/platforms/openwfd/main.cpp b/src/plugins/platforms/openwfd/main.cpp
index 2db53ea..c91a93f 100644 (file)
--- a/src/plugins/platforms/openwfd/main.cpp
+++ b/src/plugins/platforms/openwfd/main.cpp
@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
 
 class QOpenWFDIntegrationPlugin : public QPlatformIntegrationPlugin
 {
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformIntegrationFactoryInterface")
 public:
     QPlatformIntegration *create(const QString&, const QStringList&);
 };
@@ -59,6 +60,4 @@ QPlatformIntegration* QOpenWFDIntegrationPlugin::create(const QString& system, c
     return 0;
 }
 
-Q_EXPORT_PLUGIN2(openwfd, QOpenWFDIntegrationPlugin)
-
 QT_END_NAMESPACE