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:
	src/plugins/coreplugin/mainwindow.cpp

Change-Id: I975a4208588d174ebb44054de56c5ac8d7c878fe
This commit is contained in:
Eike Ziller
2012-05-02 13:53:46 +02:00
parent 1c1736944f f059018a8e
commit b1216cf376
6 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,6 +234,13 @@ MainWindow::MainWindow() :
#if defined(Q_OS_MAC)
MacFullScreen::addFullScreen(this);
#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()));
}
void MainWindow::setSidebarVisible(bool visible)
@@ -389,6 +396,7 @@ void MainWindow::extensionsInitialized()
void MainWindow::closeEvent(QCloseEvent *event)
{
m_autoSaveSessionTimer->stop();
emit m_coreImpl->saveSettingsRequested();
// Save opened files