Commit 8b4f14a8 authored by Eike Ziller's avatar Eike Ziller

Android: Use Utils::runAsync

Change-Id: I632d165be4a7e1f35e6e3d7bf401d40817b17223
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
parent c7d90621
......@@ -49,6 +49,7 @@
#include <qtsupport/qtversionmanager.h>
#include <utils/algorithm.h>
#include <utils/environment.h>
#include <utils/runextensions.h>
#include <utils/sleep.h>
#include <QDateTime>
......@@ -59,7 +60,6 @@
#include <QDirIterator>
#include <QMetaObject>
#include <QApplication>
#include <QtConcurrentRun>
#include <QStringListModel>
#include <QMessageBox>
......@@ -614,7 +614,8 @@ AndroidConfig::CreateAvdInfo AndroidConfig::gatherCreateAVDInfo(QWidget *parent,
QFuture<AndroidConfig::CreateAvdInfo> AndroidConfig::createAVD(CreateAvdInfo info) const
{
return QtConcurrent::run(&AndroidConfig::createAVDImpl, info, androidToolPath(), androidToolEnvironment());
return Utils::runAsync(&AndroidConfig::createAVDImpl, info,
androidToolPath(), androidToolEnvironment());
}
AndroidConfig::CreateAvdInfo AndroidConfig::createAVDImpl(CreateAvdInfo info, FileName androidToolPath, Environment env)
......@@ -685,7 +686,8 @@ bool AndroidConfig::removeAVD(const QString &name) const
QFuture<QVector<AndroidDeviceInfo>> AndroidConfig::androidVirtualDevicesFuture() const
{
return QtConcurrent::run(&AndroidConfig::androidVirtualDevices, androidToolPath().toString(), androidToolEnvironment());
return Utils::runAsync(&AndroidConfig::androidVirtualDevices,
androidToolPath().toString(), androidToolEnvironment());
}
QVector<AndroidDeviceInfo> AndroidConfig::androidVirtualDevices(const QString &androidTool, const Environment &environment)
......
......@@ -35,7 +35,6 @@
#include <QPainter>
#include <QStyledItemDelegate>
#include <QToolTip>
#include <QtConcurrentRun>
using namespace Android;
using namespace Android::Internal;
......
......@@ -36,11 +36,11 @@
#include <projectexplorer/target.h>
#include <qtsupport/qtkitinformation.h>
#include <utils/qtcassert.h>
#include <utils/runextensions.h>
#include <QApplication>
#include <QDir>
#include <QTime>
#include <QtConcurrentRun>
#include <QTemporaryFile>
#include <QTcpServer>
#include <QTcpSocket>
......@@ -322,7 +322,7 @@ void AndroidRunner::forceStop()
void AndroidRunner::start()
{
m_adbLogcatProcess.start(m_adb, selector() << _("logcat"));
QtConcurrent::run(this, &AndroidRunner::asyncStart);
Utils::runAsync(&AndroidRunner::asyncStart, this);
}
void AndroidRunner::asyncStart()
......
......@@ -35,6 +35,7 @@
#include <utils/environment.h>
#include <utils/hostosinfo.h>
#include <utils/pathchooser.h>
#include <utils/runextensions.h>
#include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/kitmanager.h>
#include <projectexplorer/kitinformation.h>
......@@ -52,7 +53,6 @@
#include <QMessageBox>
#include <QModelIndex>
#include <QtCore/QUrl>
#include <QtConcurrentRun>
namespace Android {
namespace Internal {
......@@ -293,7 +293,7 @@ void AndroidSettingsWidget::check(AndroidSettingsWidget::Mode mode)
}
if (!gdbPaths.isEmpty()) {
m_checkGdbWatcher.setFuture(QtConcurrent::run(&checkGdbForBrokenPython, gdbPaths));
m_checkGdbWatcher.setFuture(Utils::runAsync(&checkGdbForBrokenPython, gdbPaths));
m_gdbCheckPaths = gdbPaths;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment