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

Android: Properly split am start extra parameter

Browse Source 
Avoids, amongst others, adding an empty item if none is given.

Change-Id: Ieb823e2275ca803088a19a16d7f4238422b149c4
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
hjk
2020-06-08 09:43:11 +02:00
parent bb89b80097
commit e115e9b970
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,8 +286,10 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
m_extraAppParams = runControl->runnable().commandLineArguments; m_extraAppParams = runControl->runnable().commandLineArguments;
if (auto aspect = runControl->aspect(Constants::ANDROID_AMSTARTARGS)) if (auto aspect = runControl->aspect(Constants::ANDROID_AMSTARTARGS)) {
m_amStartExtraArgs = static_cast<BaseStringAspect *>(aspect)->value().split(' '); const QString startArgs = static_cast<BaseStringAspect *>(aspect)->value();
m_amStartExtraArgs = QtcProcess::splitArgs(startArgs, OsTypeOtherUnix);
}
if (auto aspect = runControl->aspect(Constants::ANDROID_PRESTARTSHELLCMDLIST)) { if (auto aspect = runControl->aspect(Constants::ANDROID_PRESTARTSHELLCMDLIST)) {
for (const QString &shellCmd : static_cast<BaseStringListAspect *>(aspect)->value()) for (const QString &shellCmd : static_cast<BaseStringListAspect *>(aspect)->value())