summaryrefslogtreecommitdiffstats
path: root/src/libs/installer
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2020-06-05 22:02:03 +0300
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2020-06-10 07:06:34 +0000
commita5d8d25531597de44d8296c1686a659122d9882e (patch)
tree45c5fc43ccb314004cb5cc6a92526d63e6aca18f /src/libs/installer
parent7eebeaa99645b3cb5a1e6307ba3594378ba4727f (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/libs/installer')
-rw-r--r--src/libs/installer/commandlineparser.cpp9
-rw-r--r--src/libs/installer/constants.h4
2 files changed, 13 insertions, 0 deletions
diff --git a/src/libs/installer/commandlineparser.cpp b/src/libs/installer/commandlineparser.cpp
index 6e4e86ff4..051de2c1f 100644
--- a/src/libs/installer/commandlineparser.cpp
+++ b/src/libs/installer/commandlineparser.cpp
@@ -198,6 +198,15 @@ CommandLineParser::CommandLineParser()
"<path_to_qt>/bin/qmake -r SQUISH_PATH=<pat_to_squish>"),
QLatin1String("port number")));
+ // Deprecated options
+ QCommandLineOption deprecatedUpdater(CommandLineOptions::scDeprecatedUpdater);
+ deprecatedUpdater.setHidden(true);
+ m_parser.addOption(deprecatedUpdater);
+
+ QCommandLineOption deprecatedCheckUpdates(CommandLineOptions::scDeprecatedCheckUpdates);
+ deprecatedCheckUpdates.setHidden(true);
+ m_parser.addOption(deprecatedCheckUpdates); // Behaves like check-updates but does not default to verbose output
+
// Custom extension options
m_parser.addOptions(d->extensionsOptions());
diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h
index 9e90d9383..356fa75e4 100644
--- a/src/libs/installer/constants.h
+++ b/src/libs/installer/constants.h
@@ -187,6 +187,10 @@ static const QLatin1String scStartClientLong("start-client");
static const QLatin1String scSquishPortShort("q");
static const QLatin1String scSquishPortLong("squish-port");
+// Deprecated options, provided only for backward compatibility
+static const QLatin1String scDeprecatedUpdater("updater");
+static const QLatin1String scDeprecatedCheckUpdates("checkupdates");
+
// Options supposed to be used without graphical interface
static const QStringList scCommandLineInterfaceOptions = {
scInstallShort,