feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

iOS: Remove redundant IosBuildStep::m_clean

Browse Source 
This was determined and fixed at step creation time. There is
also no way a step can morph its "cleanliness", so there's no
need to persist that either.

Change-Id: I4c49aaee2cf00b6d428a8e4a213f1f072a01f57b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-09-01 16:53:21 +02:00
parent 912fd4a1b3
commit f450c369a3
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/ios/iosbuildstep.cpp
View File

@@ -66,7 +66,7 @@ class IosBuildStep final : public AbstractProcessStep
Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosBuildStep) Q_DECLARE_TR_FUNCTIONS(Ios::Internal::IosBuildStep)
public: public:
IosBuildStep(BuildStepList *parent, Utils::Id id); IosBuildStep(BuildStepList *stepList, Utils::Id id);
private: private:
BuildStepConfigWidget *createConfigWidget() final; BuildStepConfigWidget *createConfigWidget() final;
@@ -86,7 +86,6 @@ private:
QStringList m_baseBuildArguments; QStringList m_baseBuildArguments;
QStringList m_extraArguments; QStringList m_extraArguments;
bool m_useDefaultArguments = true; bool m_useDefaultArguments = true;
bool m_clean = false;
}; };
BuildStepConfigWidget *IosBuildStep::createConfigWidget() BuildStepConfigWidget *IosBuildStep::createConfigWidget()
@@ -151,16 +150,19 @@ BuildStepConfigWidget *IosBuildStep::createConfigWidget()
return widget; return widget;
} }
IosBuildStep::IosBuildStep(BuildStepList *parent, Id id) IosBuildStep::IosBuildStep(BuildStepList *stepList, Id id)
: AbstractProcessStep(parent, id) : AbstractProcessStep(stepList, id)
{ {
setDefaultDisplayName(tr("xcodebuild")); setDefaultDisplayName(tr("xcodebuild"));
setCommandLineProvider([this] { return CommandLine(buildCommand(), allArguments()); }); setCommandLineProvider([this] { return CommandLine(buildCommand(), allArguments()); });
setUseEnglishOutput(); setUseEnglishOutput();
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) { if (stepList->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
m_clean = true; // If we are cleaning, then build 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(true);
setExtraArguments(QStringList("clean")); setExtraArguments(QStringList("clean"));
} }
} }
@@ -182,11 +184,6 @@ bool IosBuildStep::init()
setupProcessParameters(pp); setupProcessParameters(pp);
pp->setCommandLine({buildCommand(), allArguments()}); pp->setCommandLine({buildCommand(), allArguments()});
// If we are cleaning, then build 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(m_clean);
return AbstractProcessStep::init(); return AbstractProcessStep::init();
} }
@@ -204,7 +201,10 @@ QVariantMap IosBuildStep::toMap() const
map.insert(BUILD_ARGUMENTS_KEY, m_baseBuildArguments); map.insert(BUILD_ARGUMENTS_KEY, m_baseBuildArguments);
map.insert(BUILD_USE_DEFAULT_ARGS_KEY, m_useDefaultArguments); map.insert(BUILD_USE_DEFAULT_ARGS_KEY, m_useDefaultArguments);
map.insert(CLEAN_KEY, m_clean);
// Not used anymore since 4.14. But make sure older versions of Creator can read this.
map.insert(CLEAN_KEY, stepList()->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
return map; return map;
} }
@@ -213,7 +213,6 @@ bool IosBuildStep::fromMap(const QVariantMap &map)
QVariant bArgs = map.value(BUILD_ARGUMENTS_KEY); QVariant bArgs = map.value(BUILD_ARGUMENTS_KEY);
m_baseBuildArguments = bArgs.toStringList(); m_baseBuildArguments = bArgs.toStringList();
m_useDefaultArguments = map.value(BUILD_USE_DEFAULT_ARGS_KEY).toBool(); m_useDefaultArguments = map.value(BUILD_USE_DEFAULT_ARGS_KEY).toBool();
m_clean = map.value(CLEAN_KEY).toBool();
return BuildStep::fromMap(map); return BuildStep::fromMap(map);
} }