diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-05 11:13:27 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-10-05 12:40:23 +0000 |
| commit | 631b1a1732e9837ae7eeaa5113c4b6c451bae569 (patch) | |
| tree | d16608eb05d47a9b59fcdf9522706879b523fda6 | |
| parent | 6055e0174fe69e27630c1deed723752262de6456 (diff) | |
Remove pointless option for update-timestamps command
Also fix help output and CLI documentation.
Change-Id: I45229809ea2f088628f1b512200fe3c8e99f4132
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | doc/reference/cli/builtin/cli-update-timestamps.qdoc | 3 | ||||
| -rw-r--r-- | src/app/qbs/commandlinefrontend.cpp | 3 | ||||
| -rw-r--r-- | src/app/qbs/parser/parsercommand.cpp | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/doc/reference/cli/builtin/cli-update-timestamps.qdoc b/doc/reference/cli/builtin/cli-update-timestamps.qdoc index 6b15cc26b..f1bb016b9 100644 --- a/doc/reference/cli/builtin/cli-update-timestamps.qdoc +++ b/doc/reference/cli/builtin/cli-update-timestamps.qdoc @@ -36,7 +36,7 @@ \section1 Synopsis \code - qbs update-timestamps [options] [[configuration-name] [property:value] ...] + qbs update-timestamps [options] [configuration-name] ... \endcode \section1 Description @@ -54,7 +54,6 @@ \section1 Options \include cli-options.qdocinc build-directory - \include cli-options.qdocinc project-file \include cli-options.qdocinc less-verbose \include cli-options.qdocinc log-level \include cli-options.qdocinc more-verbose diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp index 746e7ffff..b4d912940 100644 --- a/src/app/qbs/commandlinefrontend.cpp +++ b/src/app/qbs/commandlinefrontend.cpp @@ -152,7 +152,8 @@ void CommandLineFrontend::start() params.setPropertyCheckingMode(ErrorHandlingMode::Strict); if (!m_parser.buildBeforeInstalling() || m_parser.command() == DumpNodesTreeCommandType || m_parser.command() == CleanCommandType - || m_parser.command() == StatusCommandType) { + || m_parser.command() == StatusCommandType + || m_parser.command() == UpdateTimestampsCommandType) { params.setRestoreBehavior(SetupProjectParameters::RestoreOnly); } foreach (const QVariantMap &buildConfig, m_parser.buildConfigurations()) { diff --git a/src/app/qbs/parser/parsercommand.cpp b/src/app/qbs/parser/parsercommand.cpp index 3b6d32635..c7f896e1a 100644 --- a/src/app/qbs/parser/parsercommand.cpp +++ b/src/app/qbs/parser/parsercommand.cpp @@ -468,7 +468,7 @@ QString UpdateTimestampsCommand::shortDescription() const QString UpdateTimestampsCommand::longDescription() const { QString description = Tr::tr( - "qbs %1 [options] [[configuration-name] [property:value] ...] ...\n") + "qbs %1 [options] [configuration-name] ...\n") .arg(representation()); description += Tr::tr("Update the timestamps of all build artifacts, causing the next " "builds of the project to do nothing if no updates to source files happen in between.\n" @@ -487,7 +487,6 @@ QString UpdateTimestampsCommand::representation() const QList<CommandLineOption::Type> UpdateTimestampsCommand::supportedOptions() const { return QList<CommandLineOption::Type>() - << CommandLineOption::FileOptionType << CommandLineOption::BuildDirectoryOptionType << CommandLineOption::LogLevelOptionType << CommandLineOption::VerboseOptionType |