From 9a946decc3d516ad4210fb06cb2c93489a2a44c8 Mon Sep 17 00:00:00 2001 From: Vikas Pachdha Date: Mon, 16 Apr 2018 13:59:13 +0200 Subject: [PATCH] Android: Give preference to detected deploy errors Task-number: QTCREATORBUG-17414 Change-Id: I35171dc8649c9ecd790a1a508ccc3d4f690ee67b Reviewed-by: Tobias Hunger --- src/plugins/android/androiddeployqtstep.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 9aa7d0f7d10..8705f649e92 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -325,11 +325,12 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy(QFutureInter emit addOutput(tr("The process \"%1\" crashed.").arg(m_command), BuildStep::OutputFormat::ErrorMessage); } - if (exitCode == 0 && exitStatus == QProcess::NormalExit) { - if (deployError != NoError && m_uninstallPreviousPackageRun) { - deployError = Failure; - } - } else { + if (deployError != NoError) { + if (m_uninstallPreviousPackageRun) + deployError = Failure; // Even re-install failed. Set to Failure. + } else if (exitCode != 0 || exitStatus != QProcess::NormalExit) { + // Set the deployError to Failure when no deployError code was detected + // but the adb tool failed otherwise relay the detected deployError. deployError = Failure; }