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 <[email protected]>
Reviewed-by: Fawzi Mohamed <[email protected]>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index 22231a529b2..dff575cd999 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<IosDeviceType>()) {
+    if (currentDType.type == IosDeviceType::SimulatedDevice && !currentDType.identifier.isEmpty()
+            && (!m_ui->deviceTypeComboBox->currentData().isValid()
+                || currentDType != m_ui->deviceTypeComboBox->currentData().value<IosDeviceType>()))
+    {
         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);