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

ToolChainManager: Do not unregister toolchains on destruction

Browse Source 
Change-Id: I9aaa292d4c1b6e7bbccce5ffe4ae780621074c98
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-02-22 17:17:17 +01:00
parent 4e285a1186
commit 7ed4f6ec48
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,11 @@ ToolChainManagerPrivate::ToolChainManagerPrivate(ToolChainManager *parent)
{ } { }
ToolChainManagerPrivate::~ToolChainManagerPrivate() ToolChainManagerPrivate::~ToolChainManagerPrivate()
{ delete m_writer; } {
qDeleteAll(m_toolChains);
m_toolChains.clear();
delete m_writer;
}
QList<ToolChain *> &ToolChainManagerPrivate::toolChains() QList<ToolChain *> &ToolChainManagerPrivate::toolChains()
{ {
@@ -210,12 +214,6 @@ void ToolChainManager::restoreToolChains()
ToolChainManager::~ToolChainManager() ToolChainManager::~ToolChainManager()
{ {
saveToolChains(); // Make sure to save tool chains when closing saveToolChains(); // Make sure to save tool chains when closing
// Deregister tool chains
QList<ToolChain *> copy = d->toolChains();
foreach (ToolChain *tc, copy)
deregisterToolChain(tc);
delete d; delete d;
m_instance = 0; m_instance = 0;
} }