iOS: Share code for simulator display name

Change-Id: Iecfaa43aefc7ed783d4149dec008330ee5c124e9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2019-08-09 11:09:27 +02:00
parent e47a01c3cb
commit dcc47f2587

View File

@@ -67,11 +67,16 @@ namespace Internal {
static const QLatin1String deviceTypeKey("Ios.device_type");
static QString displayName(const SimulatorInfo &device)
{
return QString("%1, %2").arg(device.name).arg(device.runtimeName);
}
static IosDeviceType toIosDeviceType(const SimulatorInfo &device)
{
IosDeviceType iosDeviceType(IosDeviceType::SimulatedDevice,
device.identifier,
QString("%1, %2").arg(device.name).arg(device.runtimeName));
displayName(device));
return iosDeviceType;
}
@@ -351,8 +356,7 @@ void IosDeviceTypeAspect::updateValues()
m_deviceTypeComboBox->setVisible(showDeviceSelector);
if (showDeviceSelector && m_deviceTypeModel.rowCount() == 0) {
foreach (const SimulatorInfo &device, SimulatorControl::availableSimulators()) {
QStandardItem *item = new QStandardItem(QString("%1, %2").arg(device.name)
.arg(device.runtimeName));
QStandardItem *item = new QStandardItem(Internal::displayName(device));
QVariant v;
v.setValue(device);
item->setData(v);