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

Android: Remove m_extraAppParams and m_extraEnvVars from Runnable

Browse Source 
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>
This commit is contained in:
hjk
2018-05-07 18:06:30 +02:00
parent ba01d8729e
commit 8e7c1bf1ab
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/android/androidrunnerworker.cpp
View File

@@ -426,14 +426,14 @@ void AndroidRunnerWorkerBase::asyncStart()
.arg(m_qmlServer.port()).arg(QmlDebug::qmlDebugServices(m_qmlDebugServices));
}
if (!m_androidRunnable.extraAppParams.isEmpty()) {
if (!m_extraAppParams.isEmpty()) {
args << "-e" << "extraappparams"
<< QString::fromLatin1(m_androidRunnable.extraAppParams.toUtf8().toBase64());
<< QString::fromLatin1(m_extraAppParams.toUtf8().toBase64());
}
if (m_androidRunnable.extraEnvVars.size() > 0) {
if (m_extraEnvVars.size() > 0) {
args << "-e" << "extraenvvars"
<< QString::fromLatin1(m_androidRunnable.extraEnvVars.toStringList().join('\t')
<< QString::fromLatin1(m_extraEnvVars.toStringList().join('\t')
.toUtf8().toBase64());
}
@@ -550,6 +550,16 @@ void AndroidRunnerWorkerBase::onProcessIdChanged(qint64 pid)
}
}
void AndroidRunnerWorkerBase::setExtraEnvVars(const Utils::Environment &extraEnvVars)
{
m_extraEnvVars = extraEnvVars;
}
void AndroidRunnerWorkerBase::setExtraAppParams(const QString &extraAppParams)
{
m_extraAppParams = extraAppParams;
}
AndroidRunnerWorker::AndroidRunnerWorker(RunControl *runControl, const AndroidRunnable &runnable)
: AndroidRunnerWorkerBase(runControl, runnable)