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

Qbs: Fix build after build step factory changes

Browse Source 
Change-Id: I1706bb886cdf224be6c81f212201ff317b7912e6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2016-06-10 13:58:50 +02:00
parent ea19d8b56b
commit 5718f12af5
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -697,13 +697,14 @@ QbsBuildStepFactory::QbsBuildStepFactory(QObject *parent) :
ProjectExplorer::IBuildStepFactory(parent) ProjectExplorer::IBuildStepFactory(parent)
{ } { }
void QbsBuildStepFactory::availableSteps(QList<ProjectExplorer::BuildStepInfo> *steps, QList<ProjectExplorer::BuildStepInfo> QbsBuildStepFactory::availableSteps(ProjectExplorer::BuildStepList *parent) const
ProjectExplorer::BuildStepList *parent) const
{ {
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD
&& qobject_cast<QbsBuildConfiguration *>(parent->parent()) && qobject_cast<QbsBuildConfiguration *>(parent->parent())
&& qobject_cast<QbsProject *>(parent->target()->project())) && 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) ProjectExplorer::BuildStep *QbsBuildStepFactory::create(ProjectExplorer::BuildStepList *parent, Core::Id id)

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

@@ -300,12 +300,12 @@ QbsCleanStepFactory::QbsCleanStepFactory(QObject *parent) :
ProjectExplorer::IBuildStepFactory(parent) ProjectExplorer::IBuildStepFactory(parent)
{ } { }
void QbsCleanStepFactory::availableSteps(QList<ProjectExplorer::BuildStepInfo> *steps, QList<ProjectExplorer::BuildStepInfo> QbsCleanStepFactory::availableSteps(ProjectExplorer::BuildStepList *parent) const
ProjectExplorer::BuildStepList *parent) const
{ {
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN
&& qobject_cast<QbsBuildConfiguration *>(parent->parent())) && 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) ProjectExplorer::BuildStep *QbsCleanStepFactory::create(ProjectExplorer::BuildStepList *parent, Core::Id id)

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

@@ -356,13 +356,13 @@ QbsInstallStepFactory::QbsInstallStepFactory(QObject *parent) :
ProjectExplorer::IBuildStepFactory(parent) ProjectExplorer::IBuildStepFactory(parent)
{ } { }
void QbsInstallStepFactory::availableSteps(QList<ProjectExplorer::BuildStepInfo> *steps, QList<ProjectExplorer::BuildStepInfo> QbsInstallStepFactory::availableSteps(ProjectExplorer::BuildStepList *parent) const
ProjectExplorer::BuildStepList *parent) const
{ {
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY
&& qobject_cast<ProjectExplorer::DeployConfiguration *>(parent->parent()) && qobject_cast<ProjectExplorer::DeployConfiguration *>(parent->parent())
&& qobject_cast<QbsProject *>(parent->target()->project())) && 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, ProjectExplorer::BuildStep *QbsInstallStepFactory::create(ProjectExplorer::BuildStepList *parent,