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

Android: Replace QFutureInterfaceBase with QFuture<void>

Browse Source 
In case a passed future interface is used only for checking for
cancel, use QFuture<void> instead. This will properly integrate
with QPromise API.

Change-Id: I33e5e9c62dbcfb1f7aa71eace6158e5b7c0a7098
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2023-03-09 12:04:09 +01:00
parent 301f66f190
commit bf059bff7d
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/android/androidavdmanager.h
View File

@@ -4,8 +4,9 @@
#include "androidconfigurations.h"
#include <functional>
#include <memory>
#include <QFuture>
#include <optional>
namespace Android::Internal {
@@ -22,14 +23,14 @@ public:
QString startAvd(const QString &name) const;
bool startAvdAsync(const QString &avdName) const;
QString findAvd(const QString &avdName) const;
QString waitForAvd(const QString &avdName, const QFutureInterfaceBase &fi = {}) const;
QString waitForAvd(const QString &avdName, const std::optional<QFuture<void>> &future = {}) const;
bool isAvdBooted(const QString &device) const;
static bool avdManagerCommand(const AndroidConfig &config,
const QStringList &args,
QString *output);
private:
bool waitForBooted(const QString &serialNumber, const QFutureInterfaceBase &fi = {}) const;
bool waitForBooted(const QString &serialNumber, const std::optional<QFuture<void>> &future = {}) const;
private:
const AndroidConfig &m_config;