diff options
author | hjk <hjk@qt.io> | 2018-05-15 12:50:41 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2018-05-16 10:34:01 +0000 |
commit | 130b08925de8526be2e992e9bc41c3b881188bd4 (patch) | |
tree | 1bcfcc503d6bb1381fe58f13e09ac2dfc52072ad /src/plugins/android/androidrunnerworker.h | |
parent | 099f8c7e80b615829c0250b1420e1ec123d9eb22 (diff) |
Android: Use packageName directly in AndroidRunnerWorker
That was the only remaining field of the AndroidRunnable, passing
the packageName as single string is sufficient.
Change-Id: I73333e58a0719df09d6905eb212007ce421f600e
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/plugins/android/androidrunnerworker.h')
-rw-r--r-- | src/plugins/android/androidrunnerworker.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/android/androidrunnerworker.h b/src/plugins/android/androidrunnerworker.h index 1487e71785..e34207bf03 100644 --- a/src/plugins/android/androidrunnerworker.h +++ b/src/plugins/android/androidrunnerworker.h @@ -26,12 +26,12 @@ #pragma once +#include <projectexplorer/runconfiguration.h> + #include <qmldebug/qmldebugcommandlinearguments.h> #include <QFuture> -#include "androidrunnable.h" - namespace Android { class AndroidDeviceInfo; @@ -44,7 +44,7 @@ class AndroidRunnerWorker : public QObject { Q_OBJECT public: - AndroidRunnerWorker(ProjectExplorer::RunWorker *runner, const AndroidRunnable &runnable); + AndroidRunnerWorker(ProjectExplorer::RunWorker *runner, const QString &packageName); ~AndroidRunnerWorker() override; bool adbShellAmNeedsQuotes(); bool runAdb(const QStringList &args, int timeoutS = 10); @@ -85,7 +85,7 @@ protected: // Create the processes and timer in the worker thread, for correct thread affinity bool m_isPreNougat = false; - AndroidRunnable m_androidRunnable; + QString m_packageName; QString m_intentName; QStringList m_beforeStartAdbCommands; QStringList m_afterFinishAdbCommands; |