feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Fix deployment to the real device

Browse Source 
Don't invoke onSerialNumberGroupDone handler when onGroupSetup
returned StopWithSuccess. To achieve it we change
onGroupDone into Sync.

Amends 59c10c1274

Change-Id: Ia77eef3bdc4ca04bf9169d9867cdd72b7e14ebae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2024-10-29 10:53:04 +01:00
committed by Eike Ziller
parent 05ae8f2fa8
commit d211208011
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -365,7 +365,7 @@ GroupItem AndroidDeployQtStep::runRecipe()
const auto onSerialNumberGroupSetup = [this] { const auto onSerialNumberGroupSetup = [this] {
return m_avdName.isEmpty() ? SetupResult::StopWithSuccess : SetupResult::Continue; return m_avdName.isEmpty() ? SetupResult::StopWithSuccess : SetupResult::Continue;
}; };
const auto onSerialNumberGroupDone = [this, serialNumberStorage] { const auto onSerialNumberSync = [this, serialNumberStorage] {
const QString serialNumber = *serialNumberStorage; const QString serialNumber = *serialNumberStorage;
if (serialNumber.isEmpty()) { if (serialNumber.isEmpty()) {
reportWarningOrError(Tr::tr("The deployment AVD \"%1\" cannot be started.") reportWarningOrError(Tr::tr("The deployment AVD \"%1\" cannot be started.")
@@ -415,7 +415,7 @@ GroupItem AndroidDeployQtStep::runRecipe()
serialNumberStorage, serialNumberStorage,
onGroupSetup(onSerialNumberGroupSetup), onGroupSetup(onSerialNumberGroupSetup),
AndroidAvdManager::startAvdRecipe(m_avdName, serialNumberStorage), AndroidAvdManager::startAvdRecipe(m_avdName, serialNumberStorage),
onGroupDone(onSerialNumberGroupDone) Sync(onSerialNumberSync)
}, },
deployRecipe(), deployRecipe(),
For (iterator) >> Do { For (iterator) >> Do {