diff options
| author | hjk <hjk@qt.io> | 2018-05-07 18:06:30 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2018-05-09 09:27:37 +0000 |
| commit | 8e7c1bf1ab9eee483a20b923b9e074b747b28165 (patch) | |
| tree | 8791ccf0f09b86730006b643eafda5bf6f64b985 /src/plugins/android/androidrunner.cpp | |
| parent | ba01d8729edcd2041f3f76441c2141974b2d346c (diff) | |
| download | qt-creator-8e7c1bf1ab9eee483a20b923b9e074b747b28165.tar.gz | |
Android: Remove m_extraAppParams and m_extraEnvVars from Runnable
The idea was actually to make AndroidRunnable and "everything else",
i.e. StandardRunnable more similar over time to lessen the impact
of the "matrix" problem. The two removed items are avoidable.
Change-Id: I8ef011d76e2ad0154194ff5141ef8eb92cf235f3
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Diffstat (limited to 'src/plugins/android/androidrunner.cpp')
| -rw-r--r-- | src/plugins/android/androidrunner.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp index 68b30a8031..e0fd313342 100644 --- a/src/plugins/android/androidrunner.cpp +++ b/src/plugins/android/androidrunner.cpp @@ -132,9 +132,6 @@ AndroidRunner::AndroidRunner(RunControl *runControl, m_androidRunnable.packageName = m_androidRunnable.intentName.left( m_androidRunnable.intentName.indexOf(QLatin1Char('/'))); - m_androidRunnable.extraAppParams = extraAppParams; - m_androidRunnable.extraEnvVars = extraEnvVars; - RunConfiguration *rc = runControl->runConfiguration(); if (auto aspect = rc->extraAspect(Constants::ANDROID_AMSTARTARGS_ASPECT)) m_androidRunnable.amStartExtraArgs = static_cast<BaseStringAspect *>(aspect)->value().split(' '); @@ -154,6 +151,9 @@ AndroidRunner::AndroidRunner(RunControl *runControl, m_worker.reset(new AndroidRunnerWorker(runControl, m_androidRunnable)); else m_worker.reset(new AndroidRunnerWorkerPreNougat(runControl, m_androidRunnable)); + m_worker->setExtraAppParams(extraAppParams); + m_worker->setExtraEnvVars(extraEnvVars); + m_worker->moveToThread(&m_thread); connect(this, &AndroidRunner::asyncStart, m_worker.data(), &AndroidRunnerWorkerBase::asyncStart); |