From 26befce273a3cc53ec02edbbc100d5aeca9493a1 Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Thu, 26 Feb 2009 17:19:46 +0100 Subject: Fixes: C++ Parser configuration for Qt/SDK Done by ossi --- src/plugins/qt4projectmanager/qt4nodes.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index 0a801b3d80..e2ed24cadc 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -691,9 +691,17 @@ void Qt4ProFileNode::update() Qt4PriFileNode::update(fileForCurrentProject, reader); + QString qmakeCxx = reader->value(QLatin1String("QMAKE_CXX")); + if (qmakeCxx.isEmpty()) { + // macx-xcode mkspec resets the value of QMAKE_CXX. + // Unfortunately, we need a valid QMAKE_CXX to configure the parser. + qmakeCxx = QLatin1String("c++"); + } + // update other variables QHash newVarValues; - newVarValues[CxxCompilerVar] << reader->value(QLatin1String("QMAKE_CXX")); + + newVarValues[CxxCompilerVar] << qmakeCxx; newVarValues[DefinesVar] = reader->values(QLatin1String("DEFINES")); newVarValues[IncludePathVar] = includePaths(reader); newVarValues[UiDirVar] = uiDirPaths(reader); -- cgit v1.2.1