Commit 5718f12a authored by hjk's avatar hjk

Qbs: Fix build after build step factory changes

Change-Id: I1706bb886cdf224be6c81f212201ff317b7912e6
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent ea19d8b5
......@@ -697,13 +697,14 @@ QbsBuildStepFactory::QbsBuildStepFactory(QObject *parent) :
ProjectExplorer::IBuildStepFactory(parent)
{ }
void QbsBuildStepFactory::availableSteps(QList<ProjectExplorer::BuildStepInfo> *steps,
ProjectExplorer::BuildStepList *parent) const
QList<ProjectExplorer::BuildStepInfo> QbsBuildStepFactory::availableSteps(ProjectExplorer::BuildStepList *parent) const
{
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD
&& qobject_cast<QbsBuildConfiguration *>(parent->parent())
&& qobject_cast<QbsProject *>(parent->target()->project()))
steps->append({ Constants::QBS_BUILDSTEP_ID, tr("Qbs Build") });
return {{ Constants::QBS_BUILDSTEP_ID, tr("Qbs Build") }};
return {};
}
ProjectExplorer::BuildStep *QbsBuildStepFactory::create(ProjectExplorer::BuildStepList *parent, Core::Id id)
......
......@@ -300,12 +300,12 @@ QbsCleanStepFactory::QbsCleanStepFactory(QObject *parent) :
ProjectExplorer::IBuildStepFactory(parent)
{ }
void QbsCleanStepFactory::availableSteps(QList<ProjectExplorer::BuildStepInfo> *steps,
ProjectExplorer::BuildStepList *parent) const
QList<ProjectExplorer::BuildStepInfo> QbsCleanStepFactory::availableSteps(ProjectExplorer::BuildStepList *parent) const
{
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN
&& qobject_cast<QbsBuildConfiguration *>(parent->parent()))
steps->append({ Constants::QBS_CLEANSTEP_ID, tr("Qbs Clean") });
return {{ Constants::QBS_CLEANSTEP_ID, tr("Qbs Clean") }};
return {};
}
ProjectExplorer::BuildStep *QbsCleanStepFactory::create(ProjectExplorer::BuildStepList *parent, Core::Id id)
......
......@@ -356,13 +356,13 @@ QbsInstallStepFactory::QbsInstallStepFactory(QObject *parent) :
ProjectExplorer::IBuildStepFactory(parent)
{ }
void QbsInstallStepFactory::availableSteps(QList<ProjectExplorer::BuildStepInfo> *steps,
ProjectExplorer::BuildStepList *parent) const
QList<ProjectExplorer::BuildStepInfo> QbsInstallStepFactory::availableSteps(ProjectExplorer::BuildStepList *parent) const
{
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY
&& qobject_cast<ProjectExplorer::DeployConfiguration *>(parent->parent())
&& qobject_cast<QbsProject *>(parent->target()->project()))
steps->append({ Constants::QBS_INSTALLSTEP_ID, tr("Qbs Install") });
return {{ Constants::QBS_INSTALLSTEP_ID, tr("Qbs Install") }};
return {};
}
ProjectExplorer::BuildStep *QbsInstallStepFactory::create(ProjectExplorer::BuildStepList *parent,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment