summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz.qnx@kdab.com>2012-03-09 14:23:39 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-03-10 22:41:45 (GMT)
commit0bbeb40e82dfbf98a09f3b32f042dfe34a2820c9 (patch)
tree92851111719f0fa062609dd03fad28172be0e5fb
parent810e844984e4dd757156a9069ce9db4a1dc3ae5d (diff)
downloadQt-0bbeb40e82dfbf98a09f3b32f042dfe34a2820c9.zip
Qt-0bbeb40e82dfbf98a09f3b32f042dfe34a2820c9.tar.gz
Qt-0bbeb40e82dfbf98a09f3b32f042dfe34a2820c9.tar.bz2
mkspecs: don't forget to add 'qnx' when building for x86
When building for the QNX/x86 target, we forgot to add the 'qnx' tag to CONFIG. This causes failures when third-party libraries using qmake try to scope on qnx. This change mirrors what's in the ARM target. Change-Id: I28e1df4d8636385c5555a2bb4087d26a8a9b4220 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
-rw-r--r--mkspecs/unsupported/qnx-x86-qcc/qmake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/unsupported/qnx-x86-qcc/qmake.conf b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
index fc7e4b4..edf5ae6 100644
--- a/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
+++ b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
@@ -5,7 +5,7 @@
MAKEFILE_GENERATOR = UNIX
TARGET_PLATFORM = unix
TEMPLATE = app
-CONFIG += qt warn_on release link_prl
+CONFIG += qt warn_on release link_prl qnx
QT += core gui
include(../../common/g++-unix.conf)