diff options
| author | Daniel Teske <daniel.teske@theqtcompany.com> | 2014-12-03 12:41:50 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-12-04 07:58:05 +0100 |
| commit | c6f6fcc95a1eafda96c88fe48f77c736f734d256 (patch) | |
| tree | b2dc825717579bb3bef8f4849fa0d126ebcf7b59 | |
| parent | a46307f625489805591debce42070284f8bb5c42 (diff) | |
| download | qt-creator-c6f6fcc95a1eafda96c88fe48f77c736f734d256.tar.gz | |
ProjectExplorer: Fix unload project from context menu
Task-number: QTCREATORBUG-13583
Change-Id: I8587abdd7aa6f07c511384a512c8f6d1ce7be69d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| -rw-r--r-- | src/plugins/projectexplorer/projectexplorer.cpp | 11 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/projectexplorer.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index d8e3251d7f..c9ff786ab5 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -1089,7 +1089,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er connect(dd->m_runWithoutDeployAction, SIGNAL(triggered()), this, SLOT(runProjectWithoutDeploy())); connect(dd->m_cancelBuildAction, SIGNAL(triggered()), this, SLOT(cancelBuild())); connect(dd->m_unloadAction, SIGNAL(triggered()), this, SLOT(unloadProject())); - connect(dd->m_unloadActionContextMenu, SIGNAL(triggered()), this, SLOT(unloadProject())); + connect(dd->m_unloadActionContextMenu, SIGNAL(triggered()), this, SLOT(unloadProjectContextMenu())); connect(dd->m_closeAllProjects, SIGNAL(triggered()), this, SLOT(closeAllProjects())); connect(dd->m_addNewFileAction, SIGNAL(triggered()), this, SLOT(addNewFile())); connect(dd->m_addExistingFilesAction, SIGNAL(triggered()), this, SLOT(addExistingFiles())); @@ -1272,6 +1272,15 @@ void ProjectExplorerPlugin::loadAction() updateActions(); } +void ProjectExplorerPlugin::unloadProjectContextMenu() +{ + if (debug) + qDebug() << "ProjectExplorerPlugin::unloadProjectContextMenu"; + + if (Project *p = currentProject()) + unloadProject(p); +} + void ProjectExplorerPlugin::unloadProject() { if (debug) diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h index 5ab8e7adf1..b465a0039d 100644 --- a/src/plugins/projectexplorer/projectexplorer.h +++ b/src/plugins/projectexplorer/projectexplorer.h @@ -167,6 +167,7 @@ private slots: void cancelBuild(); void loadAction(); void unloadProject(); + void unloadProjectContextMenu(); void closeAllProjects(); void newProject(); void showSessionManager(); |