From 7ed4f6ec486cb98628526094925a357591da4e8f Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Fri, 22 Feb 2013 17:17:17 +0100
Subject: [PATCH] ToolChainManager: Do not unregister toolchains on destruction

Change-Id: I9aaa292d4c1b6e7bbccce5ffe4ae780621074c98
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/projectexplorer/toolchainmanager.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp
index 334e3b376d7..cbdbd34bbfd 100644
--- a/src/plugins/projectexplorer/toolchainmanager.cpp
+++ b/src/plugins/projectexplorer/toolchainmanager.cpp
@@ -95,7 +95,11 @@ ToolChainManagerPrivate::ToolChainManagerPrivate(ToolChainManager *parent)
 { }
 
 ToolChainManagerPrivate::~ToolChainManagerPrivate()
-{ delete m_writer; }
+{
+    qDeleteAll(m_toolChains);
+    m_toolChains.clear();
+    delete m_writer;
+}
 
 QList<ToolChain *> &ToolChainManagerPrivate::toolChains()
 {
@@ -210,12 +214,6 @@ void ToolChainManager::restoreToolChains()
 ToolChainManager::~ToolChainManager()
 {
     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;
     m_instance = 0;
 }