CLI: Add short versions for message query options

Task-id: QTIFW-1982
Change-Id: I97f51c0931f4baef5e19f0e819bd6beee186301e
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>

2 files changed, 17 insertions, 9 deletions

diff --git a/src/libs/installer/commandlineparser.cpp b/src/libs/installer/commandlineparser.cpp
index 1a63aa295..23d5d04e0 100644
--- a/src/libs/installer/commandlineparser.cpp
+++ b/src/libs/installer/commandlineparser.cpp
@@ -155,17 +155,21 @@ CommandLineParser::CommandLineParser()
                       "has no effect on online installers.")));
 
     // Message query options
-    m_parser.addOption(QCommandLineOption(QStringList() << CommandLineOptions::scAcceptMessageQuery,
+    m_parser.addOption(QCommandLineOption(QStringList() << CommandLineOptions::scAcceptMessageQueryShort
+         << CommandLineOptions::scAcceptMessageQueryLong,
          QLatin1String("[CLI] Accepts all message queries without user input.")));
-    m_parser.addOption(QCommandLineOption(QStringList() << CommandLineOptions::scRejectMessageQuery,
+    m_parser.addOption(QCommandLineOption(QStringList() << CommandLineOptions::scRejectMessageQueryShort
+         << CommandLineOptions::scRejectMessageQueryLong,
          QLatin1String("[CLI] Rejects all message queries without user input.")));
-    m_parser.addOption(QCommandLineOption(QStringList() << CommandLineOptions::scMessageAutomaticAnswer,
+    m_parser.addOption(QCommandLineOption(QStringList() << CommandLineOptions::scMessageAutomaticAnswerShort
+         << CommandLineOptions::scMessageAutomaticAnswerLong,
          QLatin1String("[CLI] Automatically answers the message queries with the message identifier and button value. "
                        "Several identifier=value pairs can be given separated with comma, "
                        "for example --auto-answer message.id=Ok,message.id2=Cancel."),
          QLatin1String("identifier=value")));
-     m_parser.addOption(QCommandLineOption(QStringList() << CommandLineOptions::scMessageDefaultAnswer,
-        QLatin1String("[CLI] Automatically answers to message queries with their default values.")));
+    m_parser.addOption(QCommandLineOption(QStringList() << CommandLineOptions::scMessageDefaultAnswerShort
+         << CommandLineOptions::scMessageDefaultAnswerLong,
+         QLatin1String("[CLI] Automatically answers to message queries with their default values.")));
     m_parser.addOption(QCommandLineOption(QStringList() << CommandLineOptions::scAcceptLicenses,
          QLatin1String("[CLI] Accepts all licenses without user input.")));
     m_parser.addOption(QCommandLineOption(QStringList() << CommandLineOptions::scFileDialogAutomaticAnswer,
diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h
index f600ed033..8b73e606c 100644
--- a/src/libs/installer/constants.h
+++ b/src/libs/installer/constants.h
@@ -155,10 +155,14 @@ static const QLatin1String scStartUninstallerShort("sr");
 static const QLatin1String scStartUninstallerLong("start-uninstaller");
 
 // Message acceptance options
-static const QLatin1String scAcceptMessageQuery("accept-messages");
-static const QLatin1String scRejectMessageQuery("reject-messages");
-static const QLatin1String scMessageAutomaticAnswer("auto-answer");
-static const QLatin1String scMessageDefaultAnswer("default-answer");
+static const QLatin1String scAcceptMessageQueryShort("am");
+static const QLatin1String scAcceptMessageQueryLong("accept-messages");
+static const QLatin1String scRejectMessageQueryShort("rm");
+static const QLatin1String scRejectMessageQueryLong("reject-messages");
+static const QLatin1String scMessageAutomaticAnswerShort("aa");
+static const QLatin1String scMessageAutomaticAnswerLong("auto-answer");
+static const QLatin1String scMessageDefaultAnswerShort("da");
+static const QLatin1String scMessageDefaultAnswerLong("default-answer");
 static const QLatin1String scAcceptLicenses("accept-licenses");
 static const QLatin1String scFileDialogAutomaticAnswer("file-query");
 static const QLatin1String scConfirmCommand("confirm-command");