From 40c08af57e67a65016982b6c45fe3dffef793634 Mon Sep 17 00:00:00 2001 From: dt Date: Thu, 27 May 2010 16:36:26 +0200 Subject: Fix QMAKE_CXX parsing Task-Nr: QTCREATORBUG-1411 (cherry picked from commit 69bd2df4e4f310fc6c6a6911f1d10c4fcf2c75c9) --- src/plugins/qt4projectmanager/qtversionmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); -- cgit v1.2.3