diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-11-08 13:46:36 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-13 21:08:49 +0100 |
| commit | 6ca1df22ef42ffbb86133313b86f9027c5f9de90 (patch) | |
| tree | 6e2421aedd7248b5cb43752c4854a56300b28b28 | |
| parent | b61e53490a736b1314efb60007492d6439eadc26 (diff) | |
androiddeployqt: Fix signing package with -verbose
We would put the "-v" option inside the quotes in the zipalign
command, causing the shell to look for the executable named
"zipalign -v".
Task-number: QTBUG-34588
Change-Id: I88269cada9d77c3ddcceb6133f9bc8cf275c425a
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| -rw-r--r-- | src/androiddeployqt/main.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp index 9c3438814..e6def6232 100644 --- a/src/androiddeployqt/main.cpp +++ b/src/androiddeployqt/main.cpp @@ -1878,11 +1878,9 @@ bool signPackage(const Options &options) return false; } - if (options.verbose) - zipAlignTool += QLatin1String(" -v"); - - zipAlignTool = QString::fromLatin1("\"%1\" -f 4 %2 %3") + zipAlignTool = QString::fromLatin1("\"%1\"%2 -f 4 %3 %4") .arg(zipAlignTool) + .arg(options.verbose ? QString::fromLatin1(" -v") : QString()) .arg(options.outputDirectory + QLatin1String("/bin/") + apkName(options) |