From e115e9b9702170637444b50888260b095ccf8edc Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 8 Jun 2020 09:43:11 +0200 Subject: [PATCH] Android: Properly split am start extra parameter Avoids, amongst others, adding an empty item if none is given. Change-Id: Ieb823e2275ca803088a19a16d7f4238422b149c4 Reviewed-by: Assam Boudjelthia --- src/plugins/android/androidrunnerworker.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androidrunnerworker.cpp b/src/plugins/android/androidrunnerworker.cpp index 0e6227ac5f1..549f0d1871b 100644 --- a/src/plugins/android/androidrunnerworker.cpp +++ b/src/plugins/android/androidrunnerworker.cpp @@ -286,8 +286,10 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa m_extraAppParams = runControl->runnable().commandLineArguments; - if (auto aspect = runControl->aspect(Constants::ANDROID_AMSTARTARGS)) - m_amStartExtraArgs = static_cast(aspect)->value().split(' '); + if (auto aspect = runControl->aspect(Constants::ANDROID_AMSTARTARGS)) { + const QString startArgs = static_cast(aspect)->value(); + m_amStartExtraArgs = QtcProcess::splitArgs(startArgs, OsTypeOtherUnix); + } if (auto aspect = runControl->aspect(Constants::ANDROID_PRESTARTSHELLCMDLIST)) { for (const QString &shellCmd : static_cast(aspect)->value())