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

Merge remote-tracking branch 'origin/3.2' into HEAD

Browse Source 
Change-Id: I257bb9310bb3bde493aff4cd43091ec63fcb5203
This commit is contained in:
Eike Ziller
2014-07-22 16:11:13 +02:00
parent 341ec7f977 01d0715378
commit 0374a9782e
59 changed files with 100786 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -241,6 +241,11 @@ bool MainWindow::isNewItemDialogRunning() const
MainWindow::~MainWindow()
{
// explicitly delete window support, because that calls methods from ICore that call methods
// from mainwindow, so mainwindow still needs to be alive
delete m_windowSupport;
m_windowSupport = 0;
ExtensionSystem::PluginManager::removeObject(m_shortcutSettings);
ExtensionSystem::PluginManager::removeObject(m_generalSettings);
ExtensionSystem::PluginManager::removeObject(m_toolSettings);
@@ -371,11 +376,6 @@ void MainWindow::closeEvent(QCloseEvent *event)
m_navigationWidget->closeSubWidgets();
event->accept();
// explicitly delete window support, because that calls methods from ICore that call methods
// from mainwindow, so mainwindow still needs to be alive
delete m_windowSupport;
m_windowSupport = 0;
}
void MainWindow::openDroppedFiles(const QStringList &files)