aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2012-10-17 10:38:22 +0200
committerhjk <qthjk@ovi.com>2012-10-17 10:40:58 +0200
commite0a7c98507c38e152d2cfcf691ef62825adc7f43 (patch)
tree217d9d4ee0252261bcba3179e7f4a112eac29dcd
parent55c44bf238b26805a74a16038c8738ca8ccfb612 (diff)
Remove experimental flag from QNX plugin.
Change-Id: I3a3beced9001580ce15a74431ed73c52f432de44 Reviewed-by: hjk <qthjk@ovi.com>
-rw-r--r--src/plugins/qnx/Qnx.pluginspec.in2
-rw-r--r--src/plugins/qnx/qnx.pro3
-rw-r--r--src/plugins/qnx/qnx.qbs3
3 files changed, 1 insertions, 7 deletions
diff --git a/src/plugins/qnx/Qnx.pluginspec.in b/src/plugins/qnx/Qnx.pluginspec.in
index ffb9e6e584..864ed1b553 100644
--- a/src/plugins/qnx/Qnx.pluginspec.in
+++ b/src/plugins/qnx/Qnx.pluginspec.in
@@ -1,4 +1,4 @@
-<plugin name=\"Qnx\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\" experimental=\"$$QNX_EXPERIMENTAL_STR\">
+<plugin name=\"Qnx\" version=\"$$QTCREATOR_VERSION\" compatVersion=\"$$QTCREATOR_VERSION\">
<vendor>Research In Motion</vendor>
<copyright>(C) 2012 Research In Motion</copyright>
<license>
diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro
index ed729e954f..5bc1501bab 100644
--- a/src/plugins/qnx/qnx.pro
+++ b/src/plugins/qnx/qnx.pro
@@ -3,9 +3,6 @@ TARGET = Qnx
QT += network xml
PROVIDER = RIM
-isEmpty(QNX_ENABLE):QNX_EXPERIMENTAL_STR="true"
-else:QNX_EXPERIMENTAL_STR="false"
-
include(../../qtcreatorplugin.pri)
include(qnx_dependencies.pri)
diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs
index 27e89f17c9..a23e9c1146 100644
--- a/src/plugins/qnx/qnx.qbs
+++ b/src/plugins/qnx/qnx.qbs
@@ -14,9 +14,6 @@ QtcPlugin {
Depends { name: "RemoteLinux" }
Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
- property bool enable: false
- property var pluginspecreplacements: ({"QNX_EXPERIMENTAL_STR": (enable ? "false" : "true")})
-
cpp.defines: base.concat(["QT_NO_CAST_TO_ASCII", "QT_NO_CAST_FROM_ASCII"])
cpp.includePaths: [
"..",