From dcc47f25875014d7768957ebc32b6013470c5c90 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 9 Aug 2019 11:09:27 +0200 Subject: iOS: Share code for simulator display name Change-Id: Iecfaa43aefc7ed783d4149dec008330ee5c124e9 Reviewed-by: Christian Stenger --- src/plugins/ios/iosrunconfiguration.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index db732fe9533..b9d943da112 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -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); -- cgit v1.2.3