feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Fix keytool result handling

Browse Source 
keytool return code != 0 if the password is incorrect.

Task-number: QTCREATORBUG-17317
Change-Id: I248b4a687ef48a849d42a70940009738d29a609c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
BogDan Vatra
2017-01-04 11:37:14 +02:00
parent 9ceb1b504a
commit c4afe5d79b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -305,7 +305,7 @@ QAbstractItemModel *AndroidBuildApkStep::keystoreCertificates()
keytoolProc.setTimeoutS(30); keytoolProc.setTimeoutS(30);
const Utils::SynchronousProcessResponse response const Utils::SynchronousProcessResponse response
= keytoolProc.run(AndroidConfigurations::currentConfig().keytoolPath().toString(), params); = keytoolProc.run(AndroidConfigurations::currentConfig().keytoolPath().toString(), params);
if (response.result != Utils::SynchronousProcessResponse::Finished) { if (response.result > Utils::SynchronousProcessResponse::FinishedError) {
QMessageBox::critical(0, tr("Error"), QMessageBox::critical(0, tr("Error"),
tr("Failed to run keytool.")); tr("Failed to run keytool."));
return nullptr; return nullptr;