diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-04 16:08:56 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-05 09:27:22 +0000 |
commit | d3706fd2f87d338632901abdec0b928922d9a86e (patch) | |
tree | e2ed435bf006a40b54bfa86766de4aac8c5cd7ed | |
parent | 1f6739567cf44239b25be7b660a17a360933b617 (diff) |
Remove --jobs from the list of options for the resolve command
This command does not spawn concurrent jobs.
Change-Id: I4bc605b31ff94e463f1c65d98379843b50c36ec4
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r-- | doc/reference/cli/builtin/cli-resolve.qdoc | 1 | ||||
-rw-r--r-- | src/app/qbs/parser/parsercommand.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/doc/reference/cli/builtin/cli-resolve.qdoc b/doc/reference/cli/builtin/cli-resolve.qdoc index fd2035f57..e8a239942 100644 --- a/doc/reference/cli/builtin/cli-resolve.qdoc +++ b/doc/reference/cli/builtin/cli-resolve.qdoc @@ -50,7 +50,6 @@ \include cli-options.qdocinc dry-run \include cli-options.qdocinc project-file \include cli-options.qdocinc force-probe-execution - \include cli-options.qdocinc jobs \include cli-options.qdocinc less-verbose \include cli-options.qdocinc log-level \include cli-options.qdocinc log-time diff --git a/src/app/qbs/parser/parsercommand.cpp b/src/app/qbs/parser/parsercommand.cpp index 2ded8a458..75b385348 100644 --- a/src/app/qbs/parser/parsercommand.cpp +++ b/src/app/qbs/parser/parsercommand.cpp @@ -199,7 +199,6 @@ static QList<CommandLineOption::Type> resolveOptions() << CommandLineOption::VerboseOptionType << CommandLineOption::QuietOptionType << CommandLineOption::ShowProgressOptionType - << CommandLineOption::JobsOptionType << CommandLineOption::DryRunOptionType << CommandLineOption::ForceProbesOptionType << CommandLineOption::LogTimeOptionType; @@ -274,6 +273,7 @@ static QList<CommandLineOption::Type> buildOptions() << CommandLineOption::ForceOutputCheckOptionType << CommandLineOption::BuildNonDefaultOptionType << CommandLineOption::VersionOptionType + << CommandLineOption::JobsOptionType << CommandLineOption::CommandEchoModeOptionType << CommandLineOption::NoInstallOptionType << CommandLineOption::RemoveFirstOptionType |