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

ProjectExplorer: Pass Id to BuildStep constructor

Browse Source 
Allows to use constants in fewer places, similar to what e.g.
RunConfiguration does.

Change-Id: I9d049128206c4acf0ce14b06b66d6c090a7c5242
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-12-20 17:05:30 +01:00
parent 2f5365bf61
commit c95bde6f6a
73 changed files with 140 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,6 +80,9 @@ QbsBuildConfiguration::QbsBuildConfiguration(Target *target, Core::Id id)
{
setConfigWidgetHasFrame(true);
appendInitialBuildStep(Constants::QBS_BUILDSTEP_ID);
appendInitialCleanStep(Constants::QBS_CLEANSTEP_ID);
setInitializer([this, target](const BuildInfo &info) {
const Kit *kit = target->kit();
QVariantMap configData = info.extraInfo.value<QVariantMap>();
@@ -112,11 +115,9 @@ QbsBuildConfiguration::QbsBuildConfiguration(Target *target, Core::Id id)
m_configurationName->setValue(uniqueConfigName);
auto bs = new QbsBuildStep(buildSteps());
auto bs = buildSteps()->firstOfType<QbsBuildStep>();
QTC_ASSERT(bs, return);
bs->setQbsConfiguration(bd);
buildSteps()->appendStep(bs);
cleanSteps()->appendStep(Constants::QBS_CLEANSTEP_ID);
emit qbsConfigurationChanged();
});

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

@@ -137,8 +137,8 @@ private:
// QbsBuildStep:
// --------------------------------------------------------------------
QbsBuildStep::QbsBuildStep(ProjectExplorer::BuildStepList *bsl) :
ProjectExplorer::BuildStep(bsl, Constants::QBS_BUILDSTEP_ID)
QbsBuildStep::QbsBuildStep(BuildStepList *bsl, Core::Id id) :
BuildStep(bsl, id)
{
setDisplayName(tr("Qbs Build"));
setQbsConfiguration(QVariantMap());

2
src/plugins/qbsprojectmanager/qbsbuildstep.h
View File

@@ -51,7 +51,7 @@ public:
ExpandVariables
};
explicit QbsBuildStep(ProjectExplorer::BuildStepList *bsl);
QbsBuildStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
~QbsBuildStep() override;
QVariantMap qbsConfiguration(VariableHandling variableHandling) const;

9
src/plugins/qbsprojectmanager/qbscleanstep.cpp
View File

@@ -49,8 +49,8 @@ namespace Internal {
// QbsCleanStep:
// --------------------------------------------------------------------
QbsCleanStep::QbsCleanStep(ProjectExplorer::BuildStepList *bsl) :
ProjectExplorer::BuildStep(bsl, Constants::QBS_CLEANSTEP_ID)
QbsCleanStep::QbsCleanStep(BuildStepList *bsl, Core::Id id)
: BuildStep(bsl, id)
{
setDisplayName(tr("Qbs Clean"));
@@ -153,11 +153,6 @@ void QbsCleanStep::createTaskAndOutput(ProjectExplorer::Task::TaskType type, con
emit addOutput(message, OutputFormat::Stdout);
}
QbsBuildSystem *QbsCleanStep::qbsBuildSystem() const
{
return static_cast<QbsBuildSystem *>(buildSystem());
}
// --------------------------------------------------------------------
// QbsCleanStepFactory:
// --------------------------------------------------------------------

4
src/plugins/qbsprojectmanager/qbscleanstep.h
View File

@@ -41,7 +41,7 @@ class QbsCleanStep : public ProjectExplorer::BuildStep
Q_OBJECT
public:
explicit QbsCleanStep(ProjectExplorer::BuildStepList *bsl);
QbsCleanStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
~QbsCleanStep() override;
bool dryRun() const { return m_dryRunAspect->value(); }
@@ -62,8 +62,6 @@ private:
ProjectExplorer::BaseBoolAspect *m_dryRunAspect = nullptr;
ProjectExplorer::BaseBoolAspect *m_keepGoingAspect = nullptr;
QbsBuildSystem *qbsBuildSystem() const;
QStringList m_products;
QbsSession *m_session = nullptr;
QString m_description;

4
src/plugins/qbsprojectmanager/qbsinstallstep.cpp
View File

@@ -87,8 +87,8 @@ private:
// QbsInstallStep:
// --------------------------------------------------------------------
QbsInstallStep::QbsInstallStep(ProjectExplorer::BuildStepList *bsl) :
ProjectExplorer::BuildStep(bsl, Constants::QBS_INSTALLSTEP_ID)
QbsInstallStep::QbsInstallStep(BuildStepList *bsl, Core::Id id)
: BuildStep(bsl, id)
{
setDisplayName(tr("Qbs Install"));

2
src/plugins/qbsprojectmanager/qbsinstallstep.h
View File

@@ -41,7 +41,7 @@ class QbsInstallStep : public ProjectExplorer::BuildStep
Q_OBJECT
public:
explicit QbsInstallStep(ProjectExplorer::BuildStepList *bsl);
QbsInstallStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
~QbsInstallStep() override;
QString installRoot() const;