diff options
| author | Sean Harmer <sean.harmer.qnx@kdab.com> | 2012-08-31 12:52:07 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-04 10:23:52 (GMT) |
| commit | 9e658e82c9df52db2b0c39caa1e4e4ad3e5afe88 (patch) | |
| tree | a26c9d81ba656e04bfe62dfa3661486768b0fad6 /mkspecs/unsupported | |
| parent | 07ec091005e49a2e391c37eb2427251f8aec671b (diff) | |
| download | Qt-9e658e82c9df52db2b0c39caa1e4e4ad3e5afe88.zip Qt-9e658e82c9df52db2b0c39caa1e4e4ad3e5afe88.tar.gz Qt-9e658e82c9df52db2b0c39caa1e4e4ad3e5afe88.tar.bz2 | |
Decouple -lang-c++ from CXX command on QNX mkspecs
Making -lang-c++ integral part of the $CXX command was wrong, because there are
cases where $CXX must be called without the -lang-c++ file (when building asm
files for instance). This commit moves the -lang-c++ to $CXX_FLAGS where it
belongs.
Backport of commits
f4f185edd9dda513320e23b9a3e3f92be203884f
e3224554272600a22fd9d22bdb754832b5127da2
Change-Id: I18be06411648281bd42f3c40b8add637cd7ddfa0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/unsupported')
| -rw-r--r-- | mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf | 1 | ||||
| -rw-r--r-- | mkspecs/unsupported/qnx-x86-qcc/qmake.conf | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf b/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf index 76baa5c..de0d5db 100644 --- a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf +++ b/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf @@ -12,6 +12,7 @@ include(../../common/g++-unix.conf) include(../../common/unix.conf) QMAKE_CC = qcc -Vgcc_ntoarmv7le +QMAKE_CXX = qcc -Vgcc_ntoarmv7le QNX_CPUDIR = armle-v7 include(../../common/qcc-base-qnx.conf) diff --git a/mkspecs/unsupported/qnx-x86-qcc/qmake.conf b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf index edf5ae6..55584c2 100644 --- a/mkspecs/unsupported/qnx-x86-qcc/qmake.conf +++ b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf @@ -12,6 +12,7 @@ include(../../common/g++-unix.conf) include(../../common/unix.conf) QMAKE_CC = qcc -Vgcc_ntox86 +QMAKE_CXX = qcc -Vgcc_ntox86 QNX_CPUDIR = x86 include(../../common/qcc-base-qnx.conf) |