diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2020-10-02 09:47:53 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2020-10-06 17:34:57 +0300 |
| commit | 203e82b09c27a783a0032a9239abb67f8817c01f (patch) | |
| tree | e2d07ff84c2072effc7603ffa1084fdc82a5b334 | |
| parent | 6ba421c083ce8b9972777bdadd279a2271ccacae (diff) | |
Add short version for option --accept-licenses
Task-number: QTIFW-1984
Change-Id: I9e2c9302d4a21f169266b147bac618758f004fa5
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| -rw-r--r-- | src/libs/installer/commandlineparser.cpp | 3 | ||||
| -rw-r--r-- | src/libs/installer/constants.h | 3 | ||||
| -rw-r--r-- | src/sdk/sdkapp.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/libs/installer/commandlineparser.cpp b/src/libs/installer/commandlineparser.cpp index 2078499e2..24c771269 100644 --- a/src/libs/installer/commandlineparser.cpp +++ b/src/libs/installer/commandlineparser.cpp @@ -170,7 +170,8 @@ CommandLineParser::CommandLineParser() 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, + m_parser.addOption(QCommandLineOption(QStringList() << CommandLineOptions::scAcceptLicensesShort + << CommandLineOptions::scAcceptLicensesLong, QLatin1String("[CLI] Accepts all licenses without user input."))); m_parser.addOption(QCommandLineOption(QStringList() << CommandLineOptions::scFileDialogAutomaticAnswer, QLatin1String("[CLI] Automatically sets the QFileDialog values getExistingDirectory() or getOpenFileName() " diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h index f4d05f2eb..35fcb9c89 100644 --- a/src/libs/installer/constants.h +++ b/src/libs/installer/constants.h @@ -163,7 +163,8 @@ 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 scAcceptLicensesShort("al"); +static const QLatin1String scAcceptLicensesLong("accept-licenses"); static const QLatin1String scFileDialogAutomaticAnswer("file-query"); static const QLatin1String scConfirmCommandShort("c"); static const QLatin1String scConfirmCommandLong("confirm-command"); diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h index aa9f64956..3a32d0336 100644 --- a/src/sdk/sdkapp.h +++ b/src/sdk/sdkapp.h @@ -289,7 +289,7 @@ public: .isSet(CommandLineOptions::scCreateLocalRepositoryLong) || m_core->settings().createLocalRepository()); - if (m_parser.isSet(CommandLineOptions::scAcceptLicenses)) + if (m_parser.isSet(CommandLineOptions::scAcceptLicensesLong)) m_core->setAutoAcceptLicenses(); if (m_parser.isSet(CommandLineOptions::scConfirmCommandLong)) |