aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2018-03-23 15:46:11 +0100
committerhjk <hjk@qt.io>2018-03-23 15:09:09 +0000
commitadb169149c2aff23f069dd9850e7afa9b6d19e45 (patch)
tree875453f331e0c753bd8f4baa7ebff795aa73bde4 /src
parentceaaebdb3615139ccb3792d87893a7632f54f1db (diff)
GenericProject: Fix adding several makesteps
Fix adding several makesteps to generic projects again. The problem used to be that the constructor called by "Step" set a buildTarget of "" via the delegation to GenericMakeStep's constructor and then added "all" explicitly. So it was attempting to build two targets, with the empty target being a syntax error. Task-number: QTCREATORBUG-20108 Change-Id: I7382a1fa8b8b5869e6be11367e27d6a786f6aa74 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/genericprojectmanager/genericmakestep.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp
index 1b8cca5bfd..7bd16b8308 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.cpp
+++ b/src/plugins/genericprojectmanager/genericmakestep.cpp
@@ -311,10 +311,7 @@ GenericMakeAllStepFactory::GenericMakeAllStepFactory()
{
struct Step : GenericMakeStep
{
- Step(BuildStepList *bsl) : GenericMakeStep(bsl)
- {
- setBuildTarget("all", true);
- }
+ Step(BuildStepList *bsl) : GenericMakeStep(bsl, QString("all")) { }
};
registerStep<Step>(GENERIC_MS_ID);