diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index 49f36f2a7e6..10370dd8dbe 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -84,7 +84,6 @@ public: IosRunConfigurationWidget(IosRunConfiguration *runConfiguration); private: - void argumentsLineEditTextEdited(); void updateValues(); void setDeviceTypeIndex(int devIndex); @@ -118,11 +117,6 @@ QWidget *IosRunConfiguration::createConfigurationWidget() return new IosRunConfigurationWidget(this); } -QString IosRunConfiguration::commandLineArguments() const -{ - return extraAspect()->arguments(); -} - void IosRunConfiguration::updateDisplayNames() { if (DeviceTypeKitInformation::deviceTypeId(target()->kit()) == Constants::IOS_DEVICE_TYPE) diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h index 26b867ad474..6bb07db6d2b 100644 --- a/src/plugins/ios/iosrunconfiguration.h +++ b/src/plugins/ios/iosrunconfiguration.h @@ -49,7 +49,6 @@ public: QWidget *createConfigurationWidget() override; IosDeployStep *deployStep() const; - QString commandLineArguments() const; Utils::FileName profilePath() const; QString applicationName() const; Utils::FileName bundleDirectory() const; diff --git a/src/plugins/ios/iosrunner.cpp b/src/plugins/ios/iosrunner.cpp index 6a923be786e..0246bd1117f 100644 --- a/src/plugins/ios/iosrunner.cpp +++ b/src/plugins/ios/iosrunner.cpp @@ -37,6 +37,7 @@ #include #include +#include #include #include #include @@ -99,7 +100,7 @@ IosRunner::IosRunner(RunControl *runControl) stopRunningRunControl(runControl); auto runConfig = qobject_cast(runControl->runConfiguration()); m_bundleDir = runConfig->bundleDirectory().toString(); - m_arguments = QStringList(runConfig->commandLineArguments()); + m_arguments = runConfig->extraAspect()->arguments(); m_device = DeviceKitInformation::device(runConfig->target()->kit()); m_deviceType = runConfig->deviceType(); } @@ -124,14 +125,6 @@ QString IosRunner::bundlePath() return m_bundleDir; } -QStringList IosRunner::extraArgs() -{ - QStringList res = m_arguments; - if (m_qmlServerPort.isValid()) - res << QmlDebug::qmlDebugTcpArguments(m_qmlDebugServices, m_qmlServerPort); - return res; -} - QString IosRunner::deviceId() { IosDevice::ConstPtr dev = m_device.dynamicCast(); @@ -207,7 +200,12 @@ void IosRunner::start() this, &IosRunner::handleToolExited); connect(m_toolHandler, &IosToolHandler::finished, this, &IosRunner::handleFinished); - m_toolHandler->requestRunApp(bundlePath(), extraArgs(), runType(), deviceId()); + + QStringList args = QtcProcess::splitArgs(m_arguments, OsTypeMac); + if (m_qmlServerPort.isValid()) + args.append(QmlDebug::qmlDebugTcpArguments(m_qmlDebugServices, m_qmlServerPort)); + + m_toolHandler->requestRunApp(bundlePath(), args, runType(), deviceId()); } void IosRunner::stop() @@ -388,7 +386,7 @@ IosQmlProfilerSupport::IosQmlProfilerSupport(RunControl *runControl) auto iosRunConfig = qobject_cast(runControl->runConfiguration()); StandardRunnable runnable; runnable.executable = iosRunConfig->localExecutable().toUserOutput(); - runnable.commandLineArguments = iosRunConfig->commandLineArguments(); + runnable.commandLineArguments = iosRunConfig->extraAspect()->arguments(); runControl->setDisplayName(iosRunConfig->applicationName()); runControl->setRunnable(runnable); diff --git a/src/plugins/ios/iosrunner.h b/src/plugins/ios/iosrunner.h index 2db7cf8c0da..16d4c486fae 100644 --- a/src/plugins/ios/iosrunner.h +++ b/src/plugins/ios/iosrunner.h @@ -53,7 +53,6 @@ public: void setQmlDebugging(QmlDebug::QmlDebugServicesPreset qmlDebugServices); QString bundlePath(); - QStringList extraArgs(); QString deviceId(); IosToolHandler::RunKind runType(); bool cppDebug() const; @@ -84,7 +83,7 @@ private: IosToolHandler *m_toolHandler = nullptr; QString m_bundleDir; - QStringList m_arguments; + QString m_arguments; ProjectExplorer::IDevice::ConstPtr m_device; IosDeviceType m_deviceType; bool m_cppDebug = false;