From 6ad1ebf6f8b37e3095ca7bfb3af584386f53acd6 Mon Sep 17 00:00:00 2001
From: Sean Harmer <sean.harmer.qnx@kdab.com>
Date: Fri, 13 Apr 2012 14:16:52 +0100
Subject: Use the new plugin metadata method in the QNX QPA plugin.

Change-Id: Ib40807b97bf8d9ec26e0dfe2797786d9352ce579
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
---
 src/plugins/platforms/qnx/main.cpp | 11 +-------
 src/plugins/platforms/qnx/main.h   | 55 ++++++++++++++++++++++++++++++++++++++
 src/plugins/platforms/qnx/qnx.json |  3 +++
 src/plugins/platforms/qnx/qnx.pro  |  5 +++-
 4 files changed, 63 insertions(+), 11 deletions(-)
 create mode 100644 src/plugins/platforms/qnx/main.h
 create mode 100644 src/plugins/platforms/qnx/qnx.json

diff --git a/src/plugins/platforms/qnx/main.cpp b/src/plugins/platforms/qnx/main.cpp
index b1e1687150..2dbff096c0 100644
--- a/src/plugins/platforms/qnx/main.cpp
+++ b/src/plugins/platforms/qnx/main.cpp
@@ -39,18 +39,11 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QPlatformIntegrationPlugin>
+#include "main.h"
 #include "qqnxintegration.h"
 
 QT_BEGIN_NAMESPACE
 
-class QQnxIntegrationPlugin : public QPlatformIntegrationPlugin
-{
-public:
-    QStringList keys() const;
-    QPlatformIntegration *create(const QString&, const QStringList&);
-};
-
 QStringList QQnxIntegrationPlugin::keys() const
 {
     QStringList list;
@@ -67,6 +60,4 @@ QPlatformIntegration *QQnxIntegrationPlugin::create(const QString& system, const
     return 0;
 }
 
-Q_EXPORT_PLUGIN2(qnx, QQnxIntegrationPlugin)
-
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/main.h b/src/plugins/platforms/qnx/main.h
new file mode 100644
index 0000000000..cc2cfdd000
--- /dev/null
+++ b/src/plugins/platforms/qnx/main.h
@@ -0,0 +1,55 @@
+/***************************************************************************
+**
+** Copyright (C) 2011 - 2012 Research In Motion
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QPlatformIntegrationPlugin>
+
+QT_BEGIN_NAMESPACE
+
+class QQnxIntegrationPlugin : public QPlatformIntegrationPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformIntegrationFactoryInterface" FILE "qnx.json")
+public:
+    QStringList keys() const;
+    QPlatformIntegration *create(const QString&, const QStringList&);
+};
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/qnx/qnx.json b/src/plugins/platforms/qnx/qnx.json
new file mode 100644
index 0000000000..38df228ef4
--- /dev/null
+++ b/src/plugins/platforms/qnx/qnx.json
@@ -0,0 +1,3 @@
+{
+    "Keys": [ "qnx" ]
+}
diff --git a/src/plugins/platforms/qnx/qnx.pro b/src/plugins/platforms/qnx/qnx.pro
index 82c3b201c9..ef9ae5763e 100644
--- a/src/plugins/platforms/qnx/qnx.pro
+++ b/src/plugins/platforms/qnx/qnx.pro
@@ -43,7 +43,8 @@ SOURCES =   main.cpp \
             qqnxabstractvirtualkeyboard.cpp \
             qqnxnativeinterface.cpp
 
-HEADERS =   qqnxbuffer.h \
+HEADERS =   main.h \
+            qqnxbuffer.h \
             qqnxeventthread.h \
             qqnxkeytranslator.h \
             qqnxintegration.h \
@@ -75,6 +76,8 @@ CONFIG(qqnx_imf) {
     SOURCES += qqnxinputcontext_noimf.cpp
 }
 
+OTHER_FILES += qnx.json
+
 QMAKE_CXXFLAGS += -I./private
 
 LIBS += -lpps -lscreen -lEGL -lclipboard
-- 
cgit v1.2.3