diff options
author | hjk <hjk@qt.io> | 2019-09-04 14:17:24 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-09-05 08:47:06 +0000 |
commit | d471b6df905d9d21f9ce880815cb04c9a90d5935 (patch) | |
tree | ca28d327448f157de9a0b9d020cf3609e4967051 /src/plugins/ios | |
parent | ad6968f45f5c04d0f0cb3b7bae74f985b55bd353 (diff) |
iOS: Avoid one use of runconfiguration in IosRunner
Change-Id: If0f1e4a64db692ad373fc73087dd1f5c329a3832
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/ios')
-rw-r--r-- | src/plugins/ios/iosrunner.cpp | 4 | ||||
-rw-r--r-- | 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 9794bd9f18..4559a7fb6a 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<IosRunConfiguration *>(runControl->runConfiguration()); m_bundleDir = runConfig->bundleDirectory().toString(); - m_arguments = runControl->aspect<ArgumentsAspect>()->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 78bff4938d..8c8fab4a60 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; |