summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Bremer <wbremer@blackberry.com>2014-04-01 14:28:12 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-03 14:19:15 +0200
commitbc4590a780a59d9317d1ddcc7b8936f0847310bf (patch)
tree207b97919d5d9e339f7ce151852d48b501b05913
parentbfee43349f47ec948b7e25165d76af45bb0ec588 (diff)
BlackBerry,QNX: Switch to QMAKE_PLATFORM from CONFIG
This is the right configuration of the platform within the mkspecs. It enables the usage of additional features like the automatic detection of platform specific prf files. Change-Id: I2f19265d283e47c62455128f217bc44ba88cdc98 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--mkspecs/blackberry-armle-v7-qcc/qmake.conf2
-rw-r--r--mkspecs/blackberry-x86-qcc/qmake.conf2
-rw-r--r--mkspecs/common/qcc-base-qnx.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/blackberry-armle-v7-qcc/qmake.conf b/mkspecs/blackberry-armle-v7-qcc/qmake.conf
index 2e24e4e0d3..2fb367b8a4 100644
--- a/mkspecs/blackberry-armle-v7-qcc/qmake.conf
+++ b/mkspecs/blackberry-armle-v7-qcc/qmake.conf
@@ -5,7 +5,7 @@
load(qt_config)
DEFINES += Q_OS_BLACKBERRY
-CONFIG += blackberry
+QMAKE_PLATFORM += blackberry
LIBS += -lbps
# Blackberry also has support for stack smashing protection in its libc
diff --git a/mkspecs/blackberry-x86-qcc/qmake.conf b/mkspecs/blackberry-x86-qcc/qmake.conf
index d2c6b3c9e9..c0561694cb 100644
--- a/mkspecs/blackberry-x86-qcc/qmake.conf
+++ b/mkspecs/blackberry-x86-qcc/qmake.conf
@@ -5,7 +5,7 @@
load(qt_config)
DEFINES += Q_OS_BLACKBERRY
-CONFIG += blackberry
+QMAKE_PLATFORM += blackberry
LIBS += -lbps
# Blackberry also has support for stack smashing protection in its libc
diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf
index d28fe1fc63..e08ac9621e 100644
--- a/mkspecs/common/qcc-base-qnx.conf
+++ b/mkspecs/common/qcc-base-qnx.conf
@@ -4,7 +4,7 @@
include(qcc-base.conf)
-CONFIG += qnx
+QMAKE_PLATFORM += qnx
#Choose qnx QPA Plugin as default
QT_QPA_DEFAULT_PLATFORM = qnx