aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android/androidrunner.cpp
diff options
context:
space:
mode:
authorhjk <[email protected]>2017-03-28 18:19:00 +0200
committerhjk <[email protected]>2017-03-30 10:11:02 +0000
commiteee51e8c1d909e518ca175c87e4aebe76088ef2b (patch)
tree045093050bc79d15340cfdea4b93a18497b058f7 /src/plugins/android/androidrunner.cpp
parentc69b6f0ea9793aebd68d9c89d4c6f35d7baa9518 (diff)
Android: Adapt to ProjectExplorer::ToolRunner introduction
Change-Id: I71cc25ef3daa0eee51a4c94285174e0f3b45d41f Reviewed-by: Vikas Pachdha <[email protected]> Reviewed-by: hjk <[email protected]>
Diffstat (limited to 'src/plugins/android/androidrunner.cpp')
-rw-r--r--src/plugins/android/androidrunner.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index e7b95bc0767..778d348b685 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -684,8 +684,8 @@ void AndroidRunnerWorker::adbKill(qint64 pid)
<< "kill" << "-9" << QString::number(pid));
}
-AndroidRunner::AndroidRunner(QObject *parent, AndroidRunConfiguration *runConfig, Core::Id runMode)
- : QObject(parent), m_runConfig(runConfig)
+AndroidRunner::AndroidRunner(QObject *parent, RunConfiguration *runConfig, Core::Id runMode)
+ : QObject(parent), m_runConfig(qobject_cast<AndroidRunConfiguration *>(runConfig))
{
static const int metaTypes[] = {
qRegisterMetaType<QVector<QStringList> >("QVector<QStringList>"),
@@ -703,7 +703,7 @@ AndroidRunner::AndroidRunner(QObject *parent, AndroidRunConfiguration *runConfig
m_androidRunnable.deviceSerialNumber = AndroidManager::deviceSerialNumber(target);
m_worker.reset(new AndroidRunnerWorker(
- runConfig, runMode, m_androidRunnable.packageName,
+ m_runConfig, runMode, m_androidRunnable.packageName,
AndroidDeviceInfo::adbSelector(m_androidRunnable.deviceSerialNumber)));
m_worker->moveToThread(&m_thread);