From 1ebce824c4d5d30fbc54ce553ba8d109a68e04c2 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Wed, 30 Sep 2015 11:05:23 +0200
Subject: 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>
---
 mkspecs/common/qcc-base-qnx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mkspecs')

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
-- 
cgit v1.2.3