diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index b18888090dd..f72d5bb5a73 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -719,13 +719,23 @@ MiniProjectTargetSelector::MiniProjectTargetSelector(QAction *targetSelectorActi this, &MiniProjectTargetSelector::kitChanged); connect(m_listWidgets[TARGET], &GenericListWidget::changeActiveProjectConfiguration, - this, &MiniProjectTargetSelector::setActiveTarget); + this, [this](ProjectConfiguration *pc) { + SessionManager::setActiveTarget(m_project, static_cast(pc), SetActive::Cascade); + }); connect(m_listWidgets[BUILD], &GenericListWidget::changeActiveProjectConfiguration, - this, &MiniProjectTargetSelector::setActiveBuildConfiguration); + this, [this](ProjectConfiguration *pc) { + SessionManager::setActiveBuildConfiguration(m_project->activeTarget(), + static_cast(pc), SetActive::Cascade); + }); connect(m_listWidgets[DEPLOY], &GenericListWidget::changeActiveProjectConfiguration, - this, &MiniProjectTargetSelector::setActiveDeployConfiguration); + this, [this](ProjectConfiguration *pc) { + SessionManager::setActiveDeployConfiguration(m_project->activeTarget(), + static_cast(pc), SetActive::Cascade); + }); connect(m_listWidgets[RUN], &GenericListWidget::changeActiveProjectConfiguration, - this, &MiniProjectTargetSelector::setActiveRunConfiguration); + this, [this](ProjectConfiguration *pc) { + m_project->activeTarget()->setActiveRunConfiguration(static_cast(pc)); + }); } bool MiniProjectTargetSelector::event(QEvent *event) @@ -959,27 +969,6 @@ void MiniProjectTargetSelector::doLayout(bool keepSize) move(moveTo); } -void MiniProjectTargetSelector::setActiveTarget(ProjectConfiguration *pc) -{ - SessionManager::setActiveTarget(m_project, static_cast(pc), - SetActive::Cascade); -} - -void MiniProjectTargetSelector::setActiveBuildConfiguration(ProjectConfiguration *pc) -{ - SessionManager::setActiveBuildConfiguration(m_target, static_cast(pc), SetActive::Cascade); -} - -void MiniProjectTargetSelector::setActiveDeployConfiguration(ProjectConfiguration *pc) -{ - SessionManager::setActiveDeployConfiguration(m_target, static_cast(pc), SetActive::Cascade); -} - -void MiniProjectTargetSelector::setActiveRunConfiguration(ProjectConfiguration *pc) -{ - m_target->setActiveRunConfiguration(static_cast(pc)); -} - void MiniProjectTargetSelector::projectAdded(Project *project) { connect(project, &Project::addedTarget, diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.h b/src/plugins/projectexplorer/miniprojecttargetselector.h index 07f8da0906b..9f4bef517cf 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.h +++ b/src/plugins/projectexplorer/miniprojecttargetselector.h @@ -164,11 +164,6 @@ private: void activeDeployConfigurationChanged(ProjectExplorer::DeployConfiguration *dc); void activeRunConfigurationChanged(ProjectExplorer::RunConfiguration *rc); - void setActiveTarget(ProjectExplorer::ProjectConfiguration *pc); - void setActiveBuildConfiguration(ProjectExplorer::ProjectConfiguration *pc); - void setActiveDeployConfiguration(ProjectExplorer::ProjectConfiguration *pc); - void setActiveRunConfiguration(ProjectExplorer::ProjectConfiguration *pc); - void delayedHide(); void updateActionAndSummary(); void switchToProjectsMode();