From 91752c43b8d7880a139d2bc7555571700a638cc9 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes.zellner@nokia.com>
Date: Tue, 13 Mar 2012 17:46:22 +0100
Subject: [PATCH] Add new plugin metadata description and eglfs.json file
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: Ia594c18ba24e5fccf9fa59b9be6efcbeae00fad6
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/plugins/platforms/eglfs/eglfs.json | 3 +++
 src/plugins/platforms/eglfs/eglfs.pro  | 6 ++++--
 src/plugins/platforms/eglfs/main.cpp   | 6 ++++--
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 src/plugins/platforms/eglfs/eglfs.json

diff --git a/src/plugins/platforms/eglfs/eglfs.json b/src/plugins/platforms/eglfs/eglfs.json
new file mode 100644
index 0000000..c1ad6ca
--- /dev/null
+++ b/src/plugins/platforms/eglfs/eglfs.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "eglfs" ]
+}
diff --git a/src/plugins/platforms/eglfs/eglfs.pro b/src/plugins/platforms/eglfs/eglfs.pro
index 291e09d..ed8503b 100644
--- a/src/plugins/platforms/eglfs/eglfs.pro
+++ b/src/plugins/platforms/eglfs/eglfs.pro
@@ -1,6 +1,5 @@
 TARGET = qeglfs
-TEMPLATE = lib
-CONFIG += plugin
+load(qt_plugin)
 
 QT += core-private gui-private platformsupport-private
 
@@ -29,3 +28,6 @@ CONFIG += qpa/genericunixfontdatabase
 
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
 INSTALLS += target
+
+OTHER_FILES += \
+    eglfs.json
diff --git a/src/plugins/platforms/eglfs/main.cpp b/src/plugins/platforms/eglfs/main.cpp
index e4167bf..2ca2199 100644
--- a/src/plugins/platforms/eglfs/main.cpp
+++ b/src/plugins/platforms/eglfs/main.cpp
@@ -46,6 +46,8 @@ QT_BEGIN_NAMESPACE
 
 class QEglIntegrationPlugin : public QPlatformIntegrationPlugin
 {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformIntegrationFactoryInterface" FILE "eglfs.json")
 public:
     QStringList keys() const;
     QPlatformIntegration *create(const QString&, const QStringList&);
@@ -67,6 +69,6 @@ QPlatformIntegration* QEglIntegrationPlugin::create(const QString& system, const
     return 0;
 }
 
-Q_EXPORT_PLUGIN2(eglintegration, QEglIntegrationPlugin)
-
 QT_END_NAMESPACE
+
+#include "main.moc"
-- 
2.7.4