GenericProject: Normalize make step setup

We have only one id for the steps, so short of coming up with some
fancy upgrade mechanism, stick to the one kind of step, but also
use only one factory, and do the switch in the step constructor
based on the nature of the parent buildsteplist.

Change-Id: I8fcc599682840d61e4a7f8b6fb7b792aafdd8766
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 3 insertions, 9 deletions

diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h
index 6fe6bc47981..d48b341f59a 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.h
+++ b/src/plugins/genericprojectmanager/genericmakestep.h
@@ -37,19 +37,13 @@ class GenericMakeStep : public ProjectExplorer::MakeStep
     Q_OBJECT
 
 public:
-    explicit GenericMakeStep(ProjectExplorer::BuildStepList *parent, const QString &buildTarget = {});
+    explicit GenericMakeStep(ProjectExplorer::BuildStepList *parent);
 };
 
-class GenericMakeAllStepFactory : public ProjectExplorer::BuildStepFactory
+class GenericMakeStepFactory : public ProjectExplorer::BuildStepFactory
 {
 public:
-    GenericMakeAllStepFactory();
-};
-
-class GenericMakeCleanStepFactory : public ProjectExplorer::BuildStepFactory
-{
-public:
-    GenericMakeCleanStepFactory();
+    GenericMakeStepFactory();
 };
 
 } // namespace Internal