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

AndroidDeployQtStep: Make it cancelable

Browse Source 
And use QFutureInterface for it.

Change-Id: I1145b70b119d92af7316977c813f4f29b1f20b74
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-11-09 16:05:25 +01:00
parent 038771051d
commit 1e632d0c25
5 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/android/androidavdmanager.cpp
View File

@@ -291,20 +291,20 @@ QString AndroidAvdManager::findAvd(const QString &avdName) const
}
QString AndroidAvdManager::waitForAvd(const QString &avdName,
const std::function<bool()> &cancelChecker) const
const QFutureInterfaceBase &fi) const
{
// we cannot use adb -e wait-for-device, since that doesn't work if a emulator is already running
// 60 rounds of 2s sleeping, two minutes for the avd to start
QString serialNumber;
for (int i = 0; i < 60; ++i) {
if (cancelChecker && cancelChecker())
return QString();
if (fi.isCanceled())
return {};
serialNumber = findAvd(avdName);
if (!serialNumber.isEmpty())
return waitForBooted(serialNumber, cancelChecker) ? serialNumber : QString();
return waitForBooted(serialNumber, fi) ? serialNumber : QString();
QThread::sleep(2);
}
return QString();
return {};
}
bool AndroidAvdManager::isAvdBooted(const QString &device) const
@@ -325,11 +325,11 @@ bool AndroidAvdManager::isAvdBooted(const QString &device) const
}
bool AndroidAvdManager::waitForBooted(const QString &serialNumber,
const std::function<bool()> &cancelChecker) const
const QFutureInterfaceBase &fi) const
{
// found a serial number, now wait until it's done booting...
for (int i = 0; i < 60; ++i) {
if (cancelChecker && cancelChecker())
if (fi.isCanceled())
return false;
if (isAvdBooted(serialNumber))
return true;