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

Fix Qt4Project::toolchain() returning a wrong thing.

Browse Source 
Hmm even if the cached toolchain is correct, we do a few things, maybe
I should optimize it.
This commit is contained in:
dt
2009-09-23 17:39:50 +02:00
parent fd5ee47949
commit 1d75ebecdc
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -268,7 +268,6 @@ void Qt4Project::qtVersionsChanged()
m_rootProjectNode->update();
}
}
updateToolChain(activeBuildConfiguration());
}
void Qt4Project::updateFileList()
@@ -386,14 +385,6 @@ void Qt4Project::scheduleUpdateCodeModel(Qt4ProjectManager::Internal::Qt4ProFile
}
ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfiguration) const
{
if (!m_toolChain) {
updateToolChain(buildConfiguration);
}
return m_toolChain;
}
void Qt4Project::updateToolChain(const QString &buildConfiguration) const
{
ProjectExplorer::ToolChain *tempToolChain;
tempToolChain = qtVersion(buildConfiguration)->createToolChain(toolChainType(buildConfiguration));
@@ -404,6 +395,8 @@ void Qt4Project::updateToolChain(const QString &buildConfiguration) const
} else {
delete tempToolChain;
}
return m_toolChain;
}
QString Qt4Project::makeCommand(const QString &buildConfiguration) const
@@ -891,7 +884,6 @@ void Qt4Project::setQtVersion(const QString &buildConfiguration, int id)
void Qt4Project::setToolChainType(const QString &buildConfiguration, ProjectExplorer::ToolChain::ToolChainType type)
{
setValue(buildConfiguration, "ToolChain", (int)type);
updateToolChain(buildConfiguration);
updateActiveRunConfiguration();
}