Merge remote-tracking branch 'origin/4.14'

Change-Id: I62523c4733e617c46131048f5f62a2ca9be47d80
This commit is contained in:
Eike Ziller
2021-01-06 08:42:15 +01:00
19 changed files with 425 additions and 156 deletions

View File

@@ -43,13 +43,13 @@ public:
GenericMakeStep::GenericMakeStep(BuildStepList *parent, Utils::Id id)
: MakeStep(parent, id)
{
setAvailableBuildTargets({"all", "clean"});
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_BUILD) {
setBuildTarget("all");
setSelectedBuildTarget("all");
} else if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
setBuildTarget("clean");
setSelectedBuildTarget("clean");
setIgnoreReturnValue(true);
}
setAvailableBuildTargets({"all", "clean"});
}
GenericMakeStepFactory::GenericMakeStepFactory()