diff options
| author | Daniel Teske <daniel.teske@theqtcompany.com> | 2014-11-19 17:58:33 +0100 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@theqtcompany.com> | 2014-12-03 12:36:20 +0100 |
| commit | 4943510b60acc320dff8f2c31af69cfbfa331203 (patch) | |
| tree | dd879a4e751f005db97e5256b8f658a2ba243013 /src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp | |
| parent | 042ef1aec0e04d2568c30ab19c1f89720ed8da3e (diff) | |
Completely rework currentNode/currentProject handling
Centralize the handling inside a new class ProjectTree.
React to moving focus and remove most special handling.
This properly fixes the linked task.
Task-number: QTCREATORBUG-13357
Change-Id: I6b06aa32b1e4305ec8a6d432857b302585d8734b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index 3c02ca73ad..48f8ea5d7a 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -41,6 +41,7 @@ #include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/actioncontainer.h> #include <projectexplorer/projectexplorer.h> +#include <projectexplorer/projecttree.h> #include <QDateTime> using namespace CMakeProjectManager::Internal; @@ -67,7 +68,7 @@ CMakeManager::CMakeManager(CMakeSettingsPage *cmakeSettingsPage) command->setAttribute(Core::Command::CA_Hide); mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_DEPLOY); connect(m_runCMakeAction, &QAction::triggered, [this]() { - runCMake(ProjectExplorer::ProjectExplorerPlugin::currentProject()); + runCMake(ProjectExplorer::ProjectTree::currentProject()); }); m_runCMakeActionContextMenu = new QAction(QIcon(), tr("Run CMake"), this); |