From c4afe5d79b3d3ac6c583c5c8efa6e4823a3285ec Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kdab.com>
Date: Wed, 4 Jan 2017 11:37:14 +0200
Subject: [PATCH] Android: Fix keytool result handling

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>
---
 src/plugins/android/androidbuildapkstep.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index f72f707bf3a..3ec8dca238e 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -305,7 +305,7 @@ QAbstractItemModel *AndroidBuildApkStep::keystoreCertificates()
         keytoolProc.setTimeoutS(30);
         const Utils::SynchronousProcessResponse response
                 = keytoolProc.run(AndroidConfigurations::currentConfig().keytoolPath().toString(), params);
-        if (response.result != Utils::SynchronousProcessResponse::Finished) {
+        if (response.result > Utils::SynchronousProcessResponse::FinishedError) {
             QMessageBox::critical(0, tr("Error"),
                                   tr("Failed to run keytool."));
             return nullptr;