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

Merge commit 'origin/1.0.0'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qt4projectmanager/qt4project.cpp
	src/tools/qpatch/qpatch.cpp
This commit is contained in:
Oswald Buddenhagen
2009-03-02 12:28:01 +01:00
parent 382ec11ef5 0be29685a3
commit 2593c7798e
64 changed files with 1471 additions and 1461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -426,6 +426,11 @@ ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfigurat
Environment env = Environment::systemEnvironment();
qtVersion(activeBuildConfiguration())->addToEnvironment(env);
qmake_cxx = env.searchInPath(qmake_cxx);
if (qmake_cxx.isEmpty()) {
// macx-xcode mkspec resets the value of QMAKE_CXX.
// Unfortunately, we need a valid QMAKE_CXX to configure the parser.
qmake_cxx = QLatin1String("cc");
}
m_test = ToolChain::createGccToolChain(qmake_cxx);
//qDebug()<<"GCC ToolChain ("<<qmake_cxx<<")";
} else {