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

Merge remote-tracking branch 'origin/4.2'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/shared/qbs

Change-Id: I5050baa31f4a892d00cd6f7e088d1b597921474d
This commit is contained in:
Eike Ziller
2016-12-05 10:55:35 +01:00
parent 1e70a156f9 c390c716d1
commit 8f0ddff1cc
35 changed files with 452 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/coreplugin/find/findplugin.cpp
View File

@@ -102,12 +102,14 @@ void Find::destroy()
{
delete m_instance;
m_instance = 0;
delete d->m_currentDocumentFind;
delete d->m_findToolBar;
delete d->m_findDialog;
ExtensionSystem::PluginManager::removeObject(d->m_searchResultWindow);
delete d->m_searchResultWindow;
delete d;
if (d) {
delete d->m_currentDocumentFind;
delete d->m_findToolBar;
delete d->m_findDialog;
ExtensionSystem::PluginManager::removeObject(d->m_searchResultWindow);
delete d->m_searchResultWindow;
delete d;
}
}
Find *Find::instance()