Nim: Fix use of non-default arguments for Nimble build step

Amends 200d81d3, which mis-placed the call for argument setup,
effectively resetting it to default on each run.

Change-Id: I4b4f3ab90570d14e7ffc41346eb4f06241eb4f4c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-08-18 14:06:19 +02:00
parent ddf7f5f232
commit 7ebd7a2213

View File

@@ -103,6 +103,7 @@ NimbleBuildStep::NimbleBuildStep(BuildStepList *parentList, Id id)
m_arguments = addAspect<ArgumentsAspect>(); m_arguments = addAspect<ArgumentsAspect>();
m_arguments->setSettingsKey(Constants::C_NIMBLEBUILDSTEP_ARGUMENTS); m_arguments->setSettingsKey(Constants::C_NIMBLEBUILDSTEP_ARGUMENTS);
m_arguments->setResetter([this] { return defaultArguments(); }); m_arguments->setResetter([this] { return defaultArguments(); });
m_arguments->setArguments(defaultArguments());
setCommandLineProvider([this] { setCommandLineProvider([this] {
return CommandLine(QStandardPaths::findExecutable("nimble"), return CommandLine(QStandardPaths::findExecutable("nimble"),
@@ -119,7 +120,6 @@ NimbleBuildStep::NimbleBuildStep(BuildStepList *parentList, Id id)
bool NimbleBuildStep::init() bool NimbleBuildStep::init()
{ {
m_arguments->setArguments(defaultArguments());
ProcessParameters *params = processParameters(); ProcessParameters *params = processParameters();
setupProcessParameters(params); setupProcessParameters(params);