diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2023-07-15 09:44:27 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2023-07-17 13:57:30 +0000 |
commit | 134eee611a761b0ee0152ba419c08703998c1d92 (patch) | |
tree | b00c8ba56da23073a7f82786a8f807a653a70600 /src/plugins/android/androiddeployqtstep.cpp | |
parent | 301e18f12be3867db44e1706fa6ee8da418d7d2f (diff) |
AndroidDeployQtStep: Use promise for checking canceled state
Change-Id: I4fec6004b0b17be182088dab4deb49aa2d7c8a0b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/android/androiddeployqtstep.cpp')
-rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 6b44a850ef..c75b14bf36 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); } } |