diff options
author | Niels Weber <niels.2.weber@nokia.com> | 2012-02-22 15:09:55 +0100 |
---|---|---|
committer | Niels Weber <niels.2.weber@nokia.com> | 2012-02-23 12:03:25 +0100 |
commit | 16d807b25c55c36b2707292ce076b125ec6ec0cb (patch) | |
tree | f96c70bacf90e61b0a7f32f82ae190ff53369b2f /installerbuilder/installerbase/installerbase.cpp | |
parent | 961cdc93e2e648c9876575d1aca713f19a61cd29 (diff) |
Remove "Verbose", instead allow "-v" or "--verbose"
Change-Id: I3b402149d6cdd57b4567054f39b21b52902377c4
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Diffstat (limited to 'installerbuilder/installerbase/installerbase.cpp')
-rw-r--r-- | installerbuilder/installerbase/installerbase.cpp | 9 |
1 files changed, 5 insertions, 4 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); |