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

iOS: Avoid one use of runconfiguration in IosRunner

Browse Source 
Change-Id: If0f1e4a64db692ad373fc73087dd1f5c329a3832
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-09-04 14:17:24 +02:00
parent ad6968f45f
commit d471b6df90
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/ios/iosrunner.cpp
View File

@@ -98,7 +98,6 @@ IosRunner::IosRunner(RunControl *runControl)
stopRunningRunControl(runControl); stopRunningRunControl(runControl);
auto runConfig = qobject_cast<IosRunConfiguration *>(runControl->runConfiguration()); auto runConfig = qobject_cast<IosRunConfiguration *>(runControl->runConfiguration());
m_bundleDir = runConfig->bundleDirectory().toString(); m_bundleDir = runConfig->bundleDirectory().toString();
m_arguments = runControl->aspect<ArgumentsAspect>()->arguments(runConfig->macroExpander());
m_device = DeviceKitAspect::device(runControl->target()->kit()); m_device = DeviceKitAspect::device(runControl->target()->kit());
m_deviceType = runConfig->deviceType(); m_deviceType = runConfig->deviceType();
} }
@@ -199,7 +198,8 @@ void IosRunner::start()
connect(m_toolHandler, &IosToolHandler::finished, connect(m_toolHandler, &IosToolHandler::finished,
this, &IosRunner::handleFinished); 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()) { if (m_qmlServerPort.isValid()) {
QUrl qmlServer; QUrl qmlServer;
qmlServer.setPort(m_qmlServerPort.number()); qmlServer.setPort(m_qmlServerPort.number());

1
src/plugins/ios/iosrunner.h
View File

@@ -83,7 +83,6 @@ private:
IosToolHandler *m_toolHandler = nullptr; IosToolHandler *m_toolHandler = nullptr;
QString m_bundleDir; QString m_bundleDir;
QString m_arguments;
ProjectExplorer::IDevice::ConstPtr m_device; ProjectExplorer::IDevice::ConstPtr m_device;
IosDeviceType m_deviceType; IosDeviceType m_deviceType;
bool m_cppDebug = false; bool m_cppDebug = false;