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

ios: make device simulated configurable in runconfiguration

Browse Source 
Change-Id: I54bcbd7f2142ab95618005f1f108a122bfe18d32
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-03-28 19:05:35 +01:00
parent b0f5fbc866
commit 88f85896f1
10 changed files with 137 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@
#include "iosrunconfiguration.h"
#include "iosrunner.h"
#include "iossimulator.h"
#include "iosconstants.h"
#include <projectexplorer/devicesupport/deviceapplicationrunner.h>
#include <projectexplorer/kitinformation.h>
@@ -61,6 +62,7 @@ IosRunner::IosRunner(QObject *parent, IosRunConfiguration *runConfig, bool cppDe
m_cppDebug(cppDebug), m_qmlDebug(qmlDebug), m_cleanExit(false),
m_qmlPort(0), m_pid(0)
{
m_deviceType = runConfig->deviceType();
}
IosRunner::~IosRunner()
@@ -121,7 +123,6 @@ void IosRunner::start()
emit finished(m_cleanExit);
return;
}
IosToolHandler::DeviceType devType = IosToolHandler::IosDeviceType;
if (m_device->type() == Ios::Constants::IOS_DEVICE_TYPE) {
IosDevice::ConstPtr iosDevice = m_device.dynamicCast<const IosDevice>();
if (m_device.isNull()) {
@@ -136,12 +137,11 @@ void IosRunner::start()
emit finished(m_cleanExit);
return;
}
devType = IosToolHandler::IosSimulatedIphoneRetina4InchType; // store type in sim?
if (m_qmlDebug)
m_qmlPort = sim->nextPort();
}
m_toolHandler = new IosToolHandler(devType, this);
m_toolHandler = new IosToolHandler(m_deviceType, this);
connect(m_toolHandler, SIGNAL(appOutput(Ios::IosToolHandler*,QString)),
SLOT(handleAppOutput(Ios::IosToolHandler*,QString)));
connect(m_toolHandler,