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

@@ -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();

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\"/>

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();