Android: Don't check QtcProcess exit code

This is already baked into QtcProcess::Result.

Change-Id: I02b017c7d26b5c42ea4e00cea5c3b393274edfdc
Reviewed-by: Christian Kandeler <[email protected]>
Reviewed-by: Alessandro Portale <[email protected]>

4 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp
index d2115c6873f..de84d9c4261 100644
--- a/src/plugins/android/androidavdmanager.cpp
+++ b/src/plugins/android/androidavdmanager.cpp
@@ -204,7 +204,7 @@ bool AndroidAvdManager::removeAvd(const QString &name) const
     proc.setTimeoutS(5);
     proc.setCommand(command);
     proc.runBlocking();
-    return proc.result() == QtcProcess::FinishedWithSuccess && proc.exitCode() == 0;
+    return proc.result() == QtcProcess::FinishedWithSuccess;
 }
 
 static void avdConfigEditManufacturerTag(const QString &avdPathStr, bool recoverMode = false)
diff --git a/src/plugins/android/androidcreatekeystorecertificate.cpp b/src/plugins/android/androidcreatekeystorecertificate.cpp
index f807dc45201..6aefbde09b9 100644
--- a/src/plugins/android/androidcreatekeystorecertificate.cpp
+++ b/src/plugins/android/androidcreatekeystorecertificate.cpp
@@ -202,7 +202,7 @@ void AndroidCreateKeystoreCertificate::buttonBoxAccepted()
     genKeyCertProc.setProcessUserEventWhileRunning();
     genKeyCertProc.runBlocking();
 
-    if (genKeyCertProc.result() != QtcProcess::FinishedWithSuccess || genKeyCertProc.exitCode() != 0) {
+    if (genKeyCertProc.result() != QtcProcess::FinishedWithSuccess) {
         QMessageBox::critical(this, tr("Error"),
                               genKeyCertProc.exitMessage() + '\n' + genKeyCertProc.allOutput());
         return;
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index d50e5c84a24..aa65539eede 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -485,7 +485,7 @@ void AndroidDeployQtStep::runCommand(const CommandLine &command)
     buildProc.setCommand(command);
     buildProc.setProcessUserEventWhileRunning();
     buildProc.runBlocking();
-    if (buildProc.result() != QtcProcess::FinishedWithSuccess || buildProc.exitCode() != 0) {
+    if (buildProc.result() != QtcProcess::FinishedWithSuccess) {
         const QString error = buildProc.exitMessage();
         emit addOutput(error, OutputFormat::ErrorMessage);
         TaskHub::addTask(DeploymentTask(Task::Error, error));
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 9bdb9c9519d..c087642b088 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -539,7 +539,7 @@ bool AndroidManager::checkKeystorePassword(const QString &keystorePath, const QS
     proc.setCommand(cmd);
     proc.setProcessUserEventWhileRunning();
     proc.runBlocking();
-    return proc.result() == QtcProcess::FinishedWithSuccess && proc.exitCode() == 0;
+    return proc.result() == QtcProcess::FinishedWithSuccess;
 }
 
 bool AndroidManager::checkCertificatePassword(const QString &keystorePath, const QString &keystorePasswd, const QString &alias, const QString &certificatePasswd)
@@ -557,7 +557,7 @@ bool AndroidManager::checkCertificatePassword(const QString &keystorePath, const
     proc.setCommand({AndroidConfigurations::currentConfig().keytoolPath(), arguments});
     proc.setProcessUserEventWhileRunning();
     proc.runBlocking();
-    return proc.result() == QtcProcess::FinishedWithSuccess && proc.exitCode() == 0;
+    return proc.result() == QtcProcess::FinishedWithSuccess;
 }
 
 bool AndroidManager::checkCertificateExists(const QString &keystorePath,
@@ -572,7 +572,7 @@ bool AndroidManager::checkCertificateExists(const QString &keystorePath,
     proc.setCommand({AndroidConfigurations::currentConfig().keytoolPath(), arguments});
     proc.setProcessUserEventWhileRunning();
     proc.runBlocking();
-    return proc.result() == QtcProcess::FinishedWithSuccess && proc.exitCode() == 0;
+    return proc.result() == QtcProcess::FinishedWithSuccess;
 }
 
 using GradleProperties = QMap<QByteArray, QByteArray>;