diff options
author | con <qtc-committer@nokia.com> | 2009-02-26 17:25:11 +0100 |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2009-02-26 17:25:11 +0100 |
commit | dea170b27d701b2632b023aa3c34248abff58f76 (patch) | |
tree | e06498256e1fa68d699e452c2bc03d4ad0088eb3 /src/plugins/qt4projectmanager | |
parent | 271487d68f29fc647c18eaa4c6be675d873bd077 (diff) | |
parent | 26befce273a3cc53ec02edbbc100d5aeca9493a1 (diff) | |
download | qt-creator-dea170b27d701b2632b023aa3c34248abff58f76.tar.gz |
Merge branch '1.0.0' of git@scm.dev.nokia.troll.no:creator/mainline into 1.0.0
Diffstat (limited to 'src/plugins/qt4projectmanager')
-rw-r--r-- | src/plugins/qt4projectmanager/qt4nodes.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
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<Qt4Variable, QStringList> 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); |