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

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	tests/system/objects.map

Change-Id: Ie6aed14f2f61111d26498ff3684ea4a57e6da59e
This commit is contained in:
Eike Ziller
2012-06-01 14:06:24 +02:00
parent b2f4679c20 9499fef826
commit b7c34292f4
16 changed files with 130 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,9 +237,7 @@ MainWindow::MainWindow() :
#endif
m_autoSaveSessionTimer = new QTimer(this);
m_autoSaveSessionTimer->setSingleShot(true);
m_autoSaveSessionTimer->setInterval(10000);
m_autoSaveSessionTimer->start();
connect(m_autoSaveSessionTimer, SIGNAL(timeout()),
m_coreImpl, SIGNAL(saveSettingsRequested()));
}
@@ -383,6 +381,7 @@ void MainWindow::extensionsInitialized()
emit m_coreImpl->coreAboutToOpen();
show();
emit m_coreImpl->coreOpened();
m_autoSaveSessionTimer->start();
}
void MainWindow::closeEvent(QCloseEvent *event)