summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-08-20 12:03:50 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-08-20 16:38:51 +0200
commite1ae73cf0645468d5ab6f3fa8238a9e9d5824151 (patch)
tree8853283b18df4118b8e9a75ad060e5b746895891
parent1d209b9c3e6815f1f8d657f43472ecfef4d9f90b (diff)
downloadqt-creator-e1ae73cf0645468d5ab6f3fa8238a9e9d5824151.tar.gz
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>
-rw-r--r--src/plugins/android/androidplugin.h1
-rw-r--r--src/plugins/qnx/Qnx.pluginspec.in2
-rw-r--r--src/plugins/qnx/qnxplugin.h1
3 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/android/androidplugin.h b/src/plugins/android/androidplugin.h
index 7b7987f294..0e708ac73e 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 f76b41c61a..60ea89d343 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 26ed93e31d..af553521ea 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();