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

Merge remote branch 'origin/2.2'

Browse Source 
Conflicts:
	qtcreator.pri
	src/plugins/projectexplorer/toolchainmanager.cpp
This commit is contained in:
con
2011-03-28 11:40:45 +02:00
parent 4bc1b19da7 3a75137acd
commit 3de823ca62
72 changed files with 941 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/toolchainmanager.cpp
View File

@@ -207,6 +207,13 @@ ToolChain *ToolChainManager::findToolChain(const QString &id) const
return 0;
}
void ToolChainManager::notifyAboutUpdate(ProjectExplorer::ToolChain *tc)
{
if (!tc || !m_d->m_toolChains.contains(tc))
return;
emit toolChainUpdated(tc);
}
bool ToolChainManager::registerToolChain(ToolChain *tc)
{
if (!tc || m_d->m_toolChains.contains(tc))