diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-05-11 09:57:07 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-05-11 08:00:53 +0000 |
| commit | 1a248b1b932e2c7c42e25993d921e78c52aa4bcf (patch) | |
| tree | 3018336cb99ed27721f1448c936d04150d758900 | |
| parent | 83d958ae4e05d30b79a8c15c4430577e785c2844 (diff) | |
| download | qt-creator-1a248b1b932e2c7c42e25993d921e78c52aa4bcf.tar.gz | |
Valgrind: Remove factories from object pool when destroying them
Otherwise we get crashes on exit.
Change-Id: I806f374ba8f835c9e4361599aa901cfc4b2f0720
Reviewed-by: hjk <hjk@theqtcompany.com>
| -rw-r--r-- | src/plugins/valgrind/callgrindtool.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/valgrind/memchecktool.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index c00673c83d..ece0c27ae0 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -1014,7 +1014,7 @@ void initCallgrindTool() void destroyCallgrindTool() { - ExtensionSystem::PluginManager::addObject(theCallgrindRunControlFactory); + ExtensionSystem::PluginManager::removeObject(theCallgrindRunControlFactory); delete theCallgrindRunControlFactory; theCallgrindRunControlFactory = 0; } diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 7a8dead6f2..a076e9beba 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -728,7 +728,7 @@ void initMemcheckTool() void destroyMemcheckTool() { - ExtensionSystem::PluginManager::addObject(theMemcheckRunControlFactory); + ExtensionSystem::PluginManager::removeObject(theMemcheckRunControlFactory); delete theMemcheckRunControlFactory; theMemcheckRunControlFactory = 0; } |