6 files changed, 4 insertions, 31 deletions
diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp
index 7775ebdbc9..be644731f0 100644
--- a/src/plugins/autotoolsprojectmanager/makestep.cpp
+++ b/src/plugins/autotoolsprojectmanager/makestep.cpp
@@ -50,7 +50,7 @@ MakeStep::MakeStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id)
     setAvailableBuildTargets({"all", "clean"});
     if (bsl->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
         setBuildTarget("clean", true);
-        setClean(true);
+        setIgnoreReturnValue(true);
     } else {
         setBuildTarget("all", true);
     }
diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp
index f5cacc7c03..aabca39568 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.cpp
+++ b/src/plugins/genericprojectmanager/genericmakestep.cpp
@@ -47,7 +47,7 @@ GenericMakeStep::GenericMakeStep(BuildStepList *parent, Utils::Id id)
         setBuildTarget("all");
     } else if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
         setBuildTarget("clean");
-        setClean(true);
+        setIgnoreReturnValue(true);
     }
     setAvailableBuildTargets({"all", "clean"});
 }
diff --git a/src/plugins/projectexplorer/abstractprocessstep.cpp b/src/plugins/projectexplorer/abstractprocessstep.cpp
index 924e671690..e98d98b542 100644
--- a/src/plugins/projectexplorer/abstractprocessstep.cpp
+++ b/src/plugins/projectexplorer/abstractprocessstep.cpp
@@ -143,8 +143,6 @@ bool AbstractProcessStep::ignoreReturnValue() const
 /*!
     If \a ignoreReturnValue is set to true, then the abstractprocess step will
     return success even if the return value indicates otherwise.
-
-    Should be called from init.
 */
 
 void AbstractProcessStep::setIgnoreReturnValue(bool b)
diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp
index ef558875f0..2a7c06be47 100644
--- a/src/plugins/projectexplorer/makestep.cpp
+++ b/src/plugins/projectexplorer/makestep.cpp
@@ -162,9 +162,6 @@ MakeStep::MakeStep(BuildStepList *parent, Utils::Id id)
          .arg(text) + "</p></body></html>");
     m_nonOverrideWarning->setIconType(InfoLabel::Warning);
 
-    m_cleanAspect = addAspect<BoolAspect>();
-    m_cleanAspect->setSettingsKey(id.withSuffix(CLEAN_SUFFIX).toString());
-
     m_buildTargetsAspect = addAspect<StringListAspect>();
     m_buildTargetsAspect->setSettingsKey(id.withSuffix(BUILD_TARGETS_SUFFIX).toString());
 
@@ -207,11 +204,6 @@ bool MakeStep::init()
     setupProcessParameters(pp);
     pp->setCommandLine(make);
 
-    // If we are cleaning, then make can fail with an error code, but that doesn't mean
-    // we should stop the clean queue
-    // That is mostly so that rebuild works on an already clean project
-    setIgnoreReturnValue(isClean());
-
     return AbstractProcessStep::init();
 }
 
@@ -223,16 +215,6 @@ void MakeStep::setupOutputFormatter(OutputFormatter *formatter)
     AbstractProcessStep::setupOutputFormatter(formatter);
 }
 
-void MakeStep::setClean(bool clean)
-{
-    m_cleanAspect->setValue(clean);
-}
-
-bool MakeStep::isClean() const
-{
-    return m_cleanAspect->value();
-}
-
 QString MakeStep::defaultDisplayName()
 {
     return tr("Make");
diff --git a/src/plugins/projectexplorer/makestep.h b/src/plugins/projectexplorer/makestep.h
index 1b924c80f8..fcfa844aa9 100644
--- a/src/plugins/projectexplorer/makestep.h
+++ b/src/plugins/projectexplorer/makestep.h
@@ -69,9 +69,6 @@ public:
     Utils::FilePath makeExecutable() const;
     Utils::CommandLine effectiveMakeCommand(MakeCommandType type) const;
 
-    void setClean(bool clean);
-    bool isClean() const;
-
     static QString defaultDisplayName();
 
     Utils::FilePath defaultMakeCommand() const;
diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
index 1aac365875..89bd302e02 100644
--- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
@@ -56,7 +56,7 @@ QmakeMakeStep::QmakeMakeStep(BuildStepList *bsl, Utils::Id id)
     : MakeStep(bsl, id)
 {
     if (bsl->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
-        setClean(true);
+        setIgnoreReturnValue(true);
         setUserArguments("clean");
     }
     supportDisablingForSubdirs();
@@ -89,11 +89,6 @@ bool QmakeMakeStep::init()
         workingDirectory = bc->buildDirectory();
     pp->setWorkingDirectory(workingDirectory);
 
-    // If we are cleaning, then make can fail with a error code, but that doesn't mean
-    // we should stop the clean queue
-    // That is mostly so that rebuild works on a already clean project
-    setIgnoreReturnValue(isClean());
-
     Utils::CommandLine makeCmd(makeExecutable);
 
     QmakeProjectManager::QmakeProFileNode *subProFile = bc->subNodeBuild();
@@ -176,6 +171,7 @@ bool QmakeMakeStep::init()
             qmakeStep->setForced(true);
     }
 
+    // Note: This skips the Makestep::init() level.
     return AbstractProcessStep::init();
 }