diff options
author | Jarek Kobus <[email protected]> | 2024-10-29 10:53:04 +0100 |
---|---|---|
committer | Eike Ziller <[email protected]> | 2024-10-29 12:16:15 +0000 |
commit | d21120801115f83acb1a727cf5cc5693d2a49c62 (patch) | |
tree | 6cd374a2d348eb383ef0096282c30b4a60ece67c | |
parent | 05ae8f2fa8a7047fec49d0378a7570036d8bd2c7 (diff) |
Android: Fix deployment to the real devicev15.0.0-beta2
Don't invoke onSerialNumberGroupDone handler when onGroupSetup
returned StopWithSuccess. To achieve it we change
onGroupDone into Sync.
Amends 59c10c1274ced53ef494fc0a1f7cea06b3f5c5a7
Change-Id: Ia77eef3bdc4ca04bf9169d9867cdd72b7e14ebae
Reviewed-by: Eike Ziller <[email protected]>
-rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 21891e4878c..05cf846aef2 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -365,7 +365,7 @@ GroupItem AndroidDeployQtStep::runRecipe() const auto onSerialNumberGroupSetup = [this] { return m_avdName.isEmpty() ? SetupResult::StopWithSuccess : SetupResult::Continue; }; - const auto onSerialNumberGroupDone = [this, serialNumberStorage] { + const auto onSerialNumberSync = [this, serialNumberStorage] { const QString serialNumber = *serialNumberStorage; if (serialNumber.isEmpty()) { reportWarningOrError(Tr::tr("The deployment AVD \"%1\" cannot be started.") @@ -415,7 +415,7 @@ GroupItem AndroidDeployQtStep::runRecipe() serialNumberStorage, onGroupSetup(onSerialNumberGroupSetup), AndroidAvdManager::startAvdRecipe(m_avdName, serialNumberStorage), - onGroupDone(onSerialNumberGroupDone) + Sync(onSerialNumberSync) }, deployRecipe(), For (iterator) >> Do { |