From bc4590a780a59d9317d1ddcc7b8936f0847310bf Mon Sep 17 00:00:00 2001 From: Wolfgang Bremer Date: Tue, 1 Apr 2014 14:28:12 +0200 Subject: [PATCH] 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 Reviewed-by: Oswald Buddenhagen --- mkspecs/blackberry-armle-v7-qcc/qmake.conf | 2 +- mkspecs/blackberry-x86-qcc/qmake.conf | 2 +- mkspecs/common/qcc-base-qnx.conf | 2 +- 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 2e24e4e0d30..2fb367b8a4c 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 d2c6b3c9e94..c0561694cb8 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 d28fe1fc633..e08ac9621e0 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