Convert xlib plugin to new format

Change-Id: I00418a1eb7bf944ec360dbbb1f61f7703f3ecd37
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/plugins/platforms/xlib/main.cpp b/src/plugins/platforms/xlib/main.cpp
index 6030a72..95c4d9e 100644 (file)
--- a/src/plugins/platforms/xlib/main.cpp
+++ b/src/plugins/platforms/xlib/main.cpp
@@ -46,6 +46,8 @@ QT_BEGIN_NAMESPACE
 
 class QXlibIntegrationPlugin : public QPlatformIntegrationPlugin
 {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformIntegrationFactoryInterface" FILE "xlib.json")
 public:
     QStringList keys() const;
     QPlatformIntegration *create(const QString&, const QStringList&);
@@ -67,6 +69,6 @@ QPlatformIntegration* QXlibIntegrationPlugin::create(const QString& system, cons
     return 0;
 }
 
-Q_EXPORT_PLUGIN2(xlib, QXlibIntegrationPlugin)
-
 QT_END_NAMESPACE
+
+#include "main.moc"

diff --git a/src/plugins/platforms/xlib/xlib.json b/src/plugins/platforms/xlib/xlib.json
new file mode 100644 (file)
index 0000000..524be2f
--- /dev/null
+++ b/src/plugins/platforms/xlib/xlib.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "xlib" ]
+}

diff --git a/src/plugins/platforms/xlib/xlib.pro b/src/plugins/platforms/xlib/xlib.pro
index ea95ae8..463130a 100644 (file)
--- a/src/plugins/platforms/xlib/xlib.pro
+++ b/src/plugins/platforms/xlib/xlib.pro
@@ -32,6 +32,8 @@ HEADERS = \
         qxlibdisplay.h \
         qxlibnativeinterface.h
 
+OTHER_FILES += xlib.json
+
 LIBS += -lX11 -lXext
 
 mac {