From 78d1e2d77218b8acfe57b9f0c99255c738f7a02a Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 30 Apr 2019 11:06:49 +0200 Subject: [PATCH] Qbs: Move build step connection setup to build step constructor Instead of doing it manually afterwards on both paths that create them. Change-Id: I0e1734ae2b5028ce1d471aea0272df52acead221 Reviewed-by: Christian Kandeler --- src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp | 8 -------- src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 5 +++++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index faa0c8b7bd9..cc49cdb3c25 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -126,7 +126,6 @@ void QbsBuildConfiguration::initialize(const BuildInfo &info) BuildStepList *cleanSteps = stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN); cleanSteps->appendStep(new QbsCleanStep(cleanSteps)); - connect(bs, &QbsBuildStep::qbsConfigurationChanged, this, &QbsBuildConfiguration::qbsConfigurationChanged); emit qbsConfigurationChanged(); } @@ -141,13 +140,6 @@ bool QbsBuildConfiguration::fromMap(const QVariantMap &map) .value(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY)).toString(); m_configurationName->setValue(profileName + '-' + buildVariant); } - BuildStepList *bsl = stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); - // Fix up the existing build steps: - for (int i = 0; i < bsl->count(); ++i) { - auto bs = qobject_cast(bsl->at(i)); - if (bs) - connect(bs, &QbsBuildStep::qbsConfigurationChanged, this, &QbsBuildConfiguration::qbsConfigurationChanged); - } return true; } diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 70d17909206..490b462b781 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -128,6 +128,11 @@ QbsBuildStep::QbsBuildStep(ProjectExplorer::BuildStepList *bsl) : setDisplayName(tr("Qbs Build")); setQbsConfiguration(QVariantMap()); + auto qbsBuildConfig = qobject_cast(buildConfiguration()); + QTC_CHECK(qbsBuildConfig); + connect(this, &QbsBuildStep::qbsConfigurationChanged, + qbsBuildConfig, &QbsBuildConfiguration::qbsConfigurationChanged); + // setQbsConfiguration(other->qbsConfiguration(PreserveVariables)); }