diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2020-10-02 08:24:22 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2020-10-05 14:35:43 +0300 |
| commit | 5822426136488727bc9a9904456eb7be47487882 (patch) | |
| tree | 6bf29c4cb9f771b8f8eb8504b505366bcbd2615c /src | |
| parent | 40d75ecfbe45d945d1ac9dedc99edad4538b5da4 (diff) | |
Add short version for --confirm-command
Task-id: QTIFW-1980
Change-Id: Id4641406d67f377597575d1e7f9d2e6d312091a3
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/commandlineparser.cpp | 5 | ||||
| -rw-r--r-- | src/libs/installer/constants.h | 5 | ||||
| -rw-r--r-- | src/sdk/sdkapp.h | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/libs/installer/commandlineparser.cpp b/src/libs/installer/commandlineparser.cpp index 23d5d04e0..88ea821c9 100644 --- a/src/libs/installer/commandlineparser.cpp +++ b/src/libs/installer/commandlineparser.cpp @@ -178,8 +178,9 @@ CommandLineParser::CommandLineParser() "Several identifier=value pairs can be given separated with comma, " "for example --file-query filedialog.id=C:\Temp,filedialog.id2=C:\Temp2"), QLatin1String("identifier=value"))); - m_parser.addOption(QCommandLineOption(QStringList() << CommandLineOptions::scConfirmCommand, - QLatin1String("[CLI] Confirms starting of installation, update or removal of components without user input."))); + m_parser.addOption(QCommandLineOption(QStringList() << CommandLineOptions::scConfirmCommandShort + << CommandLineOptions::scConfirmCommandLong, QLatin1String("[CLI] Confirms starting of " + "installation, update or removal of components without user input."))); // Developer options m_parser.addOption(QCommandLineOption(QStringList() diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h index 8b73e606c..5861aeaa4 100644 --- a/src/libs/installer/constants.h +++ b/src/libs/installer/constants.h @@ -165,7 +165,8 @@ 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"); +static const QLatin1String scConfirmCommandShort("c"); +static const QLatin1String scConfirmCommandLong("confirm-command"); // Misc installation options static const QLatin1String scRootShort("t"); @@ -180,7 +181,7 @@ static const QLatin1String scShowVirtualComponentsShort("sv"); static const QLatin1String scShowVirtualComponentsLong("show-virtual-components"); static const QLatin1String scInstallCompressedRepositoryShort("i"); static const QLatin1String scInstallCompressedRepositoryLong("install-compressed-repository"); -static const QLatin1String scCreateLocalRepositoryShort("c"); +static const QLatin1String scCreateLocalRepositoryShort("cl"); static const QLatin1String scCreateLocalRepositoryLong("create-local-repository"); static const QLatin1String scNoDefaultInstallationLong("no-default-installations"); diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h index 2a2a36f2d..aa9f64956 100644 --- a/src/sdk/sdkapp.h +++ b/src/sdk/sdkapp.h @@ -292,7 +292,7 @@ public: if (m_parser.isSet(CommandLineOptions::scAcceptLicenses)) m_core->setAutoAcceptLicenses(); - if (m_parser.isSet(CommandLineOptions::scConfirmCommand)) + if (m_parser.isSet(CommandLineOptions::scConfirmCommandLong)) m_core->setAutoConfirmCommand(); // Ignore message acceptance options when running the installer with GUI |