diff options
| author | dt <qtc-committer@nokia.com> | 2010-05-27 16:36:26 +0200 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2010-06-07 12:43:17 +0200 |
| commit | 40c08af57e67a65016982b6c45fe3dffef793634 (patch) | |
| tree | d1ab29f0ef6757c370662afe3d454e77c5cbf53f | |
| parent | e3e71d4437e9d95cffb1ee1a5e8518add97c8c45 (diff) | |
| download | qt-creator-40c08af57e67a65016982b6c45fe3dffef793634.tar.gz | |
Fix QMAKE_CXX parsing
Task-Nr: QTCREATORBUG-1411
(cherry picked from commit 69bd2df4e4f310fc6c6a6911f1d10c4fcf2c75c9)
| -rw-r--r-- | src/plugins/qt4projectmanager/qtversionmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 10006b1821..4b7fc1f1c8 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -1335,7 +1335,7 @@ void QtVersion::updateToolChainAndMkspec() const reader->setCumulative(false); reader->setParsePreAndPostFiles(false); reader->readProFile(m_mkspecFullPath + "/qmake.conf"); - QString qmakeCXX = reader->value("QMAKE_CXX"); + QString qmakeCXX = reader->values("QMAKE_CXX").join(" "); QString makefileGenerator = reader->value("MAKEFILE_GENERATOR"); QString ce_sdk = reader->values("CE_SDK").join(QLatin1String(" ")); QString ce_arch = reader->value("CE_ARCH"); |