diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2020-06-05 22:02:03 +0300 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2020-06-10 07:06:34 +0000 |
| commit | a5d8d25531597de44d8296c1686a659122d9882e (patch) | |
| tree | 45c5fc43ccb314004cb5cc6a92526d63e6aca18f /src/sdk/main.cpp | |
| parent | 7eebeaa99645b3cb5a1e6307ba3594378ba4727f (diff) | |
Reintroduce removed --checkupdates and --updater as deprecated options
These should be only provided for backward compatibility and be hidden
from help text.
Task-number: QTIFW-1791
Change-Id: Iff92bdf0be425edf724d3bcd3984458eca5f8ff2
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/sdk/main.cpp')
| -rw-r--r-- | src/sdk/main.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp index 8745541d7..8243beb5e 100644 --- a/src/sdk/main.cpp +++ b/src/sdk/main.cpp @@ -91,6 +91,9 @@ int main(int argc, char *argv[]) mutually << CommandLineOptions::scStartPackageManagerLong; if (parser.isSet(CommandLineOptions::scStartUninstallerLong)) mutually << CommandLineOptions::scStartUninstallerLong; + // IFW 3.x.x style --updater option support provided for backward compatibility + if (parser.isSet(CommandLineOptions::scDeprecatedUpdater)) + mutually << CommandLineOptions::scDeprecatedUpdater; if (mutually.count() > 1) { sanityMessage = QString::fromLatin1("The following options are mutually exclusive: %1.") @@ -219,7 +222,10 @@ int main(int argc, char *argv[]) const SelfRestarter restarter(argc, argv); if (parser.positionalArguments().contains(CommandLineOptions::scCheckUpdatesShort) - || parser.positionalArguments().contains(CommandLineOptions::scCheckUpdatesLong)) { + || parser.positionalArguments().contains(CommandLineOptions::scCheckUpdatesLong) + || parser.isSet(CommandLineOptions::scDeprecatedCheckUpdates)) { + // Also check for deprecated --checkupdates option, which is superseded by check-updates + // command in IFW 4.x.x. Should not be used for normal interactive usage. return CommandLineInterface(argc, argv).checkUpdates(); } else if (parser.positionalArguments().contains(CommandLineOptions::scListShort) || parser.positionalArguments().contains(CommandLineOptions::scListLong)) { |