feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch '1.0.0' of git@scm.dev.nokia.troll.no:creator/mainline into 1.0.0

Browse Source
This commit is contained in:
con
2009-02-26 17:25:11 +01:00
parent 271487d68f 26befce273
commit dea170b27d
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -691,9 +691,17 @@ void Qt4ProFileNode::update()
Qt4PriFileNode::update(fileForCurrentProject, reader); 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 // update other variables
QHash<Qt4Variable, QStringList> newVarValues; QHash<Qt4Variable, QStringList> newVarValues;
newVarValues[CxxCompilerVar] << reader->value(QLatin1String("QMAKE_CXX"));
newVarValues[CxxCompilerVar] << qmakeCxx;
newVarValues[DefinesVar] = reader->values(QLatin1String("DEFINES")); newVarValues[DefinesVar] = reader->values(QLatin1String("DEFINES"));
newVarValues[IncludePathVar] = includePaths(reader); newVarValues[IncludePathVar] = includePaths(reader);
newVarValues[UiDirVar] = uiDirPaths(reader); newVarValues[UiDirVar] = uiDirPaths(reader);