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

Session: Fix compilation

Browse Source 
This was broken in fe8ed7f5a6

Change-Id: Iff4dffa6ba6cfdeeb3664c026ce642b80e4deeeb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Robert Loehning
2014-09-26 14:46:59 +02:00
committed by Daniel Teske
parent fe8ed7f5a6
commit 9d3ae49e30
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -1277,8 +1277,8 @@ void ProjectExplorerPlugin::updateRunWithoutDeployMenu()
ExtensionSystem::IPlugin::ShutdownFlag ProjectExplorerPlugin::aboutToShutdown() ExtensionSystem::IPlugin::ShutdownFlag ProjectExplorerPlugin::aboutToShutdown()
{ {
disconnect(ModeManager::instance(), &ModeManager::currentModeChanged, disconnect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*,Core::IMode*)),
this, &ProjectExplorerPlugin::currentModeChanged); this, SLOT(currentModeChanged(Core::IMode*,Core::IMode*)));
d->m_proWindow->aboutToShutdown(); // disconnect from session d->m_proWindow->aboutToShutdown(); // disconnect from session
SessionManager::closeAllProjects(); SessionManager::closeAllProjects();
d->m_projectsMode = 0; d->m_projectsMode = 0;
@@ -1675,8 +1675,8 @@ void ProjectExplorerPlugin::restoreSession()
SessionManager::loadSession(d->m_sessionToRestoreAtStartup); SessionManager::loadSession(d->m_sessionToRestoreAtStartup);
// update welcome page // update welcome page
connect(ModeManager::instance(), &ModeManager::currentModeChanged, connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*,Core::IMode*)),
this, &ProjectExplorerPlugin::currentModeChanged); this, SLOT(currentModeChanged(Core::IMode*,Core::IMode*)));
#if HAS_WELCOME_PAGE #if HAS_WELCOME_PAGE
connect(d->m_welcomePage, SIGNAL(requestSession(QString)), this, SLOT(loadSession(QString))); connect(d->m_welcomePage, SIGNAL(requestSession(QString)), this, SLOT(loadSession(QString)));
connect(d->m_welcomePage, SIGNAL(requestProject(QString)), this, SLOT(openProjectWelcomePage(QString))); connect(d->m_welcomePage, SIGNAL(requestProject(QString)), this, SLOT(openProjectWelcomePage(QString)));