From e8ea09cc32d0f07b5bdada2f4d5e5ddd7a3ceae0 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Mon, 1 Dec 2014 11:44:14 +0100 Subject: iOS: do not set simulator type before initial setup The run configuration did try to set the simulator type for devices, and also before knowing the available simulators. Make most IosDeviceType initialisations explicit about the device type. Change-Id: I22b87bf4568e1af0c12b1fb91d3074bf29438db2 Reviewed-by: Eike Ziller Reviewed-by: Fawzi Mohamed --- src/plugins/ios/iosrunconfiguration.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/plugins/ios/iosrunconfiguration.cpp') diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index 22231a529b..dff575cd99 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -162,7 +162,7 @@ QStringList IosRunConfiguration::commandLineArguments() void IosRunConfiguration::updateDisplayNames() { if (DeviceTypeKitInformation::deviceTypeId(target()->kit()) == Constants::IOS_DEVICE_TYPE) - m_deviceType = IosDeviceType(); + m_deviceType = IosDeviceType(IosDeviceType::IosDevice); else if (m_deviceType.type == IosDeviceType::IosDevice) m_deviceType = IosDeviceType(IosDeviceType::SimulatedDevice); IDevice::ConstPtr dev = DeviceKitInformation::device(target()->kit()); @@ -474,8 +474,10 @@ void IosRunConfigurationWidget::updateValues() QString argsString = argListToString(args); IosDeviceType currentDType = m_runConfiguration->deviceType(); - if (!m_ui->deviceTypeComboBox->currentData().isValid() - || currentDType != m_ui->deviceTypeComboBox->currentData().value()) { + if (currentDType.type == IosDeviceType::SimulatedDevice && !currentDType.identifier.isEmpty() + && (!m_ui->deviceTypeComboBox->currentData().isValid() + || currentDType != m_ui->deviceTypeComboBox->currentData().value())) + { bool didSet = false; for (int i = 0; m_deviceTypeModel.hasIndex(i, 0); ++i) { QVariant vData = m_deviceTypeModel.data(m_deviceTypeModel.index(i, 0), Qt::UserRole + 1); -- cgit v1.2.1