summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/qtversionmanager.cpp
diff options
context:
space:
mode:
authordt <qtc-committer@nokia.com>2010-05-27 16:36:26 +0200
committerdt <qtc-committer@nokia.com>2010-05-27 16:36:26 +0200
commit69bd2df4e4f310fc6c6a6911f1d10c4fcf2c75c9 (patch)
tree3e3012347925daa8755158bfc18c5b2d6dc1378f /src/plugins/qt4projectmanager/qtversionmanager.cpp
parentde7af4f22be85e3e31f2547f0bb9ca77a6e8b661 (diff)
downloadqt-creator-69bd2df4e4f310fc6c6a6911f1d10c4fcf2c75c9.tar.gz
Fix QMAKE_CXX parsing
Task-Nr: QTCREATORBUG-1411
Diffstat (limited to 'src/plugins/qt4projectmanager/qtversionmanager.cpp')
-rw-r--r--src/plugins/qt4projectmanager/qtversionmanager.cpp2
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");