From d471b6df905d9d21f9ce880815cb04c9a90d5935 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 4 Sep 2019 14:17:24 +0200 Subject: [PATCH] iOS: Avoid one use of runconfiguration in IosRunner Change-Id: If0f1e4a64db692ad373fc73087dd1f5c329a3832 Reviewed-by: Eike Ziller --- src/plugins/ios/iosrunner.cpp | 4 ++-- src/plugins/ios/iosrunner.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp index 9794bd9f189..4559a7fb6af 100644 --- a/src/plugins/ios/iosrunner.cpp +++ b/src/plugins/ios/iosrunner.cpp @@ -98,7 +98,6 @@ IosRunner::IosRunner(RunControl *runControl) stopRunningRunControl(runControl); auto runConfig = qobject_cast(runControl->runConfiguration()); m_bundleDir = runConfig->bundleDirectory().toString(); - m_arguments = runControl->aspect()->arguments(runConfig->macroExpander()); m_device = DeviceKitAspect::device(runControl->target()->kit()); m_deviceType = runConfig->deviceType(); } @@ -199,7 +198,8 @@ void IosRunner::start() connect(m_toolHandler, &IosToolHandler::finished, this, &IosRunner::handleFinished); - QStringList args = QtcProcess::splitArgs(m_arguments, OsTypeMac); + const Runnable runnable = runControl()->runnable(); + QStringList args = QtcProcess::splitArgs(runnable.commandLineArguments, OsTypeMac); if (m_qmlServerPort.isValid()) { QUrl qmlServer; qmlServer.setPort(m_qmlServerPort.number()); diff --git a/src/plugins/ios/iosrunner.h b/src/plugins/ios/iosrunner.h index 78bff4938df..8c8fab4a604 100644 --- a/src/plugins/ios/iosrunner.h +++ b/src/plugins/ios/iosrunner.h @@ -83,7 +83,6 @@ private: IosToolHandler *m_toolHandler = nullptr; QString m_bundleDir; - QString m_arguments; ProjectExplorer::IDevice::ConstPtr m_device; IosDeviceType m_deviceType; bool m_cppDebug = false;