summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-09-30 11:05:23 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-10-01 16:18:55 +0000
commit1ebce824c4d5d30fbc54ce553ba8d109a68e04c2 (patch)
treed03a1999525b229db41592fa0cd136557c9238ac /mkspecs
parent939dc7765665799f3db6ebeb167ea0ba86ccb0ce (diff)
fix place of "qnx" in $$QMAKE_PLATFORM
it must come first, as it is most specific. an alternative fix would be re-organizing the includes, but that requires a lot more effort to get right. Change-Id: I1526a3c966f3dc3f3df1efc00ec271d333ed7ebf Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/common/qcc-base-qnx.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf
index dbbf346ea2..156ba0ddd8 100644
--- a/mkspecs/common/qcc-base-qnx.conf
+++ b/mkspecs/common/qcc-base-qnx.conf
@@ -4,7 +4,7 @@
include(qcc-base.conf)
-QMAKE_PLATFORM += qnx
+QMAKE_PLATFORM = qnx $$QMAKE_PLATFORM
#Choose qnx QPA Plugin as default
QT_QPA_DEFAULT_PLATFORM = qnx