From 134eee611a761b0ee0152ba419c08703998c1d92 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Sat, 15 Jul 2023 09:44:27 +0200
Subject: [PATCH] AndroidDeployQtStep: Use promise for checking canceled state

Change-Id: I4fec6004b0b17be182088dab4deb49aa2d7c8a0b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androiddeployqtstep.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index 6b44a850ef9..c75b14bf362 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -91,7 +91,7 @@ private:
     bool init() override;
     Tasking::GroupItem runRecipe() final;
     void gatherFilesToPull();
-    DeployErrorCode runDeploy();
+    DeployErrorCode runDeploy(QPromise<void> &promise);
     void slotAskForUninstall(DeployErrorCode errorCode);
 
     void runImpl(QPromise<void> &promise);
@@ -341,7 +341,7 @@ bool AndroidDeployQtStep::init()
     return true;
 }
 
-AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy()
+AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy(QPromise<void> &promise)
 {
     CommandLine cmd(m_command);
     if (m_useAndroiddeployqt && m_apkPath.isEmpty()) {
@@ -404,7 +404,7 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy()
         if (process.state() == QProcess::NotRunning)
             break;
 
-        if (isCanceled()) {
+        if (promise.isCanceled()) {
             process.kill();
             process.waitForFinished();
         }
@@ -494,12 +494,12 @@ void AndroidDeployQtStep::runImpl(QPromise<void> &promise)
         AndroidManager::setDeviceSerialNumber(target(), serialNumber);
     }
 
-    DeployErrorCode returnValue = runDeploy();
+    DeployErrorCode returnValue = runDeploy(promise);
     if (returnValue > DeployErrorCode::NoError && returnValue < DeployErrorCode::Failure) {
         emit askForUninstall(returnValue);
         if (m_askForUninstall) {
             m_uninstallPreviousPackageRun = true;
-            returnValue = runDeploy();
+            returnValue = runDeploy(promise);
         }
     }