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

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

Browse Source
This commit is contained in:
hjk
2009-02-13 12:35:18 +01:00
parent 7ad54e6313 9cb615609c
commit 5f33b124e3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -406,7 +406,7 @@ ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfigurat
{ {
qDebug()<<"Qt4Project::toolChain() for buildconfiguration:"<<buildConfiguration; qDebug()<<"Qt4Project::toolChain() for buildconfiguration:"<<buildConfiguration;
Q_UNUSED(buildConfiguration); Q_UNUSED(buildConfiguration);
ToolChain *m_test; ToolChain *m_test= 0;
QtVersion *version = qtVersion(activeBuildConfiguration()); QtVersion *version = qtVersion(activeBuildConfiguration());
ToolChain::ToolChainType t = version->toolchainType(); ToolChain::ToolChainType t = version->toolchainType();
if (t == ToolChain::MinGW) { if (t == ToolChain::MinGW) {
@@ -436,9 +436,7 @@ ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfigurat
qDebug()<<"Qt Creator doesn't know about the system includes, nor the systems defines."; qDebug()<<"Qt Creator doesn't know about the system includes, nor the systems defines.";
} }
if (ToolChain::equals(m_test, m_toolChain)) {
if (m_test == m_toolChain) {
delete m_test; delete m_test;
} else { } else {
delete m_toolChain; delete m_toolChain;
@@ -716,7 +714,9 @@ ProjectExplorer::Environment Qt4Project::baseEnvironment(const QString &buildCon
{ {
Environment env = useSystemEnvironment(buildConfiguration) ? Environment(QProcess::systemEnvironment()) : Environment(); Environment env = useSystemEnvironment(buildConfiguration) ? Environment(QProcess::systemEnvironment()) : Environment();
qtVersion(buildConfiguration)->addToEnvironment(env); qtVersion(buildConfiguration)->addToEnvironment(env);
toolChain(buildConfiguration)->addToEnvironment(env); ToolChain *tc = toolChain(buildConfiguration);
if (tc)
tc->addToEnvironment(env);
return env; return env;
} }