From 69bd2df4e4f310fc6c6a6911f1d10c4fcf2c75c9 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Thu, 27 May 2010 16:36:26 +0200
Subject: [PATCH] Fix QMAKE_CXX parsing
Task-Nr: QTCREATORBUG-1411
---
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 10006b18219..4b7fc1f1c87 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");
--
GitLab