diff options
| -rw-r--r-- | src/plugins/genericprojectmanager/genericbuildconfiguration.h | 2 | ||||
| -rw-r--r-- | src/plugins/projectexplorer/runconfiguration.cpp | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.h b/src/plugins/genericprojectmanager/genericbuildconfiguration.h index 32200199bf2..0c4d1fe52c4 100644 --- a/src/plugins/genericprojectmanager/genericbuildconfiguration.h +++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.h @@ -35,7 +35,7 @@ class GenericBuildConfiguration : public ProjectExplorer::BuildConfiguration Q_OBJECT friend class ProjectExplorer::BuildConfigurationFactory; - GenericBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id); + GenericBuildConfiguration(ProjectExplorer::Target *target, Core::Id id); void addToEnvironment(Utils::Environment &env) const final; }; diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 724995f8450..5eaf0b19567 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -165,12 +165,7 @@ RunConfiguration::RunConfiguration(Target *target, Core::Id id) : ProjectConfiguration(target, id) { QTC_CHECK(target && target == this->target()); - connect(target, &Target::parsingFinished, this, &RunConfiguration::enabledChanged); - - connect(this, &RunConfiguration::enabledChanged, this, [this] { - if (isActive() && project() == SessionManager::startupProject()) - emit ProjectExplorerPlugin::instance()->updateRunActions(); - }); + connect(target, &Target::parsingFinished, this, &RunConfiguration::update); Utils::MacroExpander *expander = macroExpander(); expander->setDisplayName(tr("Run Settings")); @@ -309,6 +304,9 @@ void RunConfiguration::update() m_updater(); emit enabledChanged(); + + if (isActive() && project() == SessionManager::startupProject()) + emit ProjectExplorerPlugin::instance()->updateRunActions(); } BuildTargetInfo RunConfiguration::buildTargetInfo() const |