From e1ae73cf0645468d5ab6f3fa8238a9e9d5824151 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 20 Aug 2012 12:03:50 +0200
Subject: [PATCH] QNX/Android: Add missing plugin metadata specifications for
 Qt 5.

Reshuffle the pluginspec file such that the XSL transformation
generates a valid file.

Change-Id: I006eecf1efbb45a10c6dc414cb1d1b278b2cce5a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
---
 src/plugins/android/androidplugin.h | 1 +
 src/plugins/qnx/Qnx.pluginspec.in   | 2 +-
 src/plugins/qnx/qnxplugin.h         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/android/androidplugin.h b/src/plugins/android/androidplugin.h
index 7b7987f2948..0e708ac73ef 100644
--- a/src/plugins/android/androidplugin.h
+++ b/src/plugins/android/androidplugin.h
@@ -38,6 +38,7 @@ namespace Android {
 class AndroidPlugin : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Android.json")
 
 public:
     AndroidPlugin();
diff --git a/src/plugins/qnx/Qnx.pluginspec.in b/src/plugins/qnx/Qnx.pluginspec.in
index f76b41c61a6..60ea89d3439 100644
--- a/src/plugins/qnx/Qnx.pluginspec.in
+++ b/src/plugins/qnx/Qnx.pluginspec.in
@@ -11,8 +11,8 @@ GNU Lesser General Public License Usage
 Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation.  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.
     </license>
     <description>Adds support for QNX to Qt Creator</description>
-    <url>http://www.rim.com</url>
     <category>Device Support</category>
+    <url>http://www.rim.com</url>
     <dependencyList>
         <dependency name=\"Core\" version=\"$$QTCREATOR_VERSION\"/>
         <dependency name=\"Qt4ProjectManager\" version=\"$$QTCREATOR_VERSION\"/>
diff --git a/src/plugins/qnx/qnxplugin.h b/src/plugins/qnx/qnxplugin.h
index 26ed93e31d2..af553521ea0 100644
--- a/src/plugins/qnx/qnxplugin.h
+++ b/src/plugins/qnx/qnxplugin.h
@@ -42,6 +42,7 @@ namespace Internal {
 class QNXPlugin : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Qnx.json")
 
 public:
     QNXPlugin();