diff options
| -rw-r--r-- | installerbuilder/installerbase/installerbase.cpp | 9 | ||||
| -rw-r--r-- | installerbuilder/installerbase/installerbase_p.cpp | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp index 72879f722..e1943e949 100644 --- a/installerbuilder/installerbase/installerbase.cpp +++ b/installerbuilder/installerbase/installerbase.cpp @@ -174,7 +174,7 @@ int main(int argc, char *argv[]) return 0; Updater u; - u.setVerbose(args.contains(QLatin1String("--verbose"))); + u.setVerbose(args.contains(QLatin1String("--verbose")) || args.contains(QLatin1String("-v"))); return u.checkForUpdates() ? 0 : 1; } @@ -182,7 +182,8 @@ int main(int argc, char *argv[]) || args.contains(QLatin1String("--undooperation"))) { MyCoreApplication app(argc, argv); OperationRunner o; - o.setVerbose(args.contains(QLatin1String("--verbose"))); + o.setVerbose(args.contains(QLatin1String("--verbose")) + || args.contains(QLatin1String("-v"))); return o.runOperation(args); } @@ -206,7 +207,7 @@ int main(int argc, char *argv[]) Sleep::sleep(1); } - if (args.contains(QLatin1String("--verbose")) || args.contains(QLatin1String("Verbose"))) { + if (args.contains(QLatin1String("--verbose")) || args.contains(QLatin1String("-v"))) { app.setVerbose(); QInstaller::setVerbose(true); } @@ -296,7 +297,7 @@ int main(int argc, char *argv[]) } else { return PackageManagerCore::Failure; } - } else if (argument == QLatin1String("--verbose") || argument == QLatin1String("Verbose")) { + } else if (argument == QLatin1String("--verbose") || argument == QLatin1String("-v")) { core.setVerbose(true); } else if (argument == QLatin1String("--proxy")) { core.settings().setProxyType(QInstaller::Settings::SystemProxy); diff --git a/installerbuilder/installerbase/installerbase_p.cpp b/installerbuilder/installerbase/installerbase_p.cpp index ad4bdc21c..57da967fd 100644 --- a/installerbuilder/installerbase/installerbase_p.cpp +++ b/installerbuilder/installerbase/installerbase_p.cpp @@ -206,9 +206,11 @@ static bool supportedScheme(const QString &scheme) int InstallerBase::replaceMaintenanceToolBinary(QStringList arguments) { - QInstaller::setVerbose(arguments.contains(QLatin1String("--verbose"))); + QInstaller::setVerbose(arguments.contains(QLatin1String("--verbose")) + || arguments.contains(QLatin1String("-v"))); arguments.removeAll(QLatin1String("--verbose")); + arguments.removeAll(QLatin1String("-v")); arguments.removeAll(QLatin1String("--update-installerbase")); QUrl url = arguments.value(1); |