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

7
src/plugins/projectexplorer/session.cpp
View File

@@ -108,12 +108,6 @@ SessionManager::SessionManager(QObject *parent)
this, SLOT(markSessionFileDirty()));
connect(em, SIGNAL(editorsClosed(QList<Core::IEditor*>)),
this, SLOT(markSessionFileDirty()));
m_autoSaveSessionTimer = new QTimer(this);
m_autoSaveSessionTimer->setSingleShot(true);
m_autoSaveSessionTimer->setInterval(10000);
connect(m_autoSaveSessionTimer, SIGNAL(timeout()),
ICore::instance(), SIGNAL(saveSettingsRequested()));
}
SessionManager::~SessionManager()
@@ -902,7 +896,6 @@ void SessionManager::reportProjectLoadingProgress()
void SessionManager::markSessionFileDirty(bool makeDefaultVirginDirty)
{
m_autoSaveSessionTimer->start();
if (makeDefaultVirginDirty)
m_virginSession = false;
}