diff options
author | hjk <hjk@qt.io> | 2020-08-19 09:00:58 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-08-26 04:51:47 +0000 |
commit | 070e0932c9bc33f2861a05138c54fbb6ecaf38e2 (patch) | |
tree | ff7daa333dcd8ff8d789507234e28b1f9e7170d4 /src/plugins/projectexplorer | |
parent | 6c785c05abf279e70a171acd2f7869f1f44c7685 (diff) | |
download | qt-creator-070e0932c9bc33f2861a05138c54fbb6ecaf38e2.tar.gz |
ProjectExplorer: Remove redundant MakeStep::{is,set}Clean()
This was only used for setIgnoreReturnValue(), which can be done
directly and also does not need to be stored in the settings.
Change-Id: I7419efe66d164b223463e19c3daf2350b4a2bae4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer')
-rw-r--r-- | src/plugins/projectexplorer/abstractprocessstep.cpp | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/makestep.cpp | 18 | ||||
-rw-r--r-- | src/plugins/projectexplorer/makestep.h | 3 |
3 files changed, 0 insertions, 23 deletions
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; |