feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qbs: Move build step connection setup to build step constructor

Browse Source 
Instead of doing it manually afterwards on both paths that create
them.

Change-Id: I0e1734ae2b5028ce1d471aea0272df52acead221
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-04-30 11:06:49 +02:00
parent 1a78230c00
commit 78d1e2d772
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
View File

@@ -126,7 +126,6 @@ void QbsBuildConfiguration::initialize(const BuildInfo &info)
BuildStepList *cleanSteps = stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN); BuildStepList *cleanSteps = stepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
cleanSteps->appendStep(new QbsCleanStep(cleanSteps)); cleanSteps->appendStep(new QbsCleanStep(cleanSteps));
connect(bs, &QbsBuildStep::qbsConfigurationChanged, this, &QbsBuildConfiguration::qbsConfigurationChanged);
emit qbsConfigurationChanged(); emit qbsConfigurationChanged();
} }
@@ -141,13 +140,6 @@ bool QbsBuildConfiguration::fromMap(const QVariantMap &map)
.value(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY)).toString(); .value(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY)).toString();
m_configurationName->setValue(profileName + '-' + buildVariant); 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<QbsBuildStep *>(bsl->at(i));
if (bs)
connect(bs, &QbsBuildStep::qbsConfigurationChanged, this, &QbsBuildConfiguration::qbsConfigurationChanged);
}
return true; return true;
} }

5
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -128,6 +128,11 @@ QbsBuildStep::QbsBuildStep(ProjectExplorer::BuildStepList *bsl) :
setDisplayName(tr("Qbs Build")); setDisplayName(tr("Qbs Build"));
setQbsConfiguration(QVariantMap()); setQbsConfiguration(QVariantMap());
auto qbsBuildConfig = qobject_cast<QbsBuildConfiguration *>(buildConfiguration());
QTC_CHECK(qbsBuildConfig);
connect(this, &QbsBuildStep::qbsConfigurationChanged,
qbsBuildConfig, &QbsBuildConfiguration::qbsConfigurationChanged);
// setQbsConfiguration(other->qbsConfiguration(PreserveVariables)); // setQbsConfiguration(other->qbsConfiguration(PreserveVariables));
} }