aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/ios
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-08-01 14:30:10 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2019-08-02 12:23:12 +0000
commit45f9c178e1f475bd7412b93b4e984336a4c2fa4a (patch)
treed6fadbd45982342a0cabcc45f867ff0ce8d5343c /src/plugins/ios
parent86d0c7ef66576262685df2e38e95ee4018bfa0e0 (diff)
ProjectExplorer::IDevice: Add a default display name
Task-number: QTCREATORBUG-16281 Change-Id: Ieff929343b5dc3a84d9ecf5f4f0a032cb4ae4076 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/ios')
-rw-r--r--src/plugins/ios/iosdevice.cpp4
-rw-r--r--src/plugins/ios/iossimulator.cpp3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp
index 922cf5009a..314e1de88c 100644
--- a/src/plugins/ios/iosdevice.cpp
+++ b/src/plugins/ios/iosdevice.cpp
@@ -83,7 +83,7 @@ IosDevice::IosDevice()
{
setupId(IDevice::AutoDetected, Constants::IOS_DEVICE_ID);
setType(Constants::IOS_DEVICE_TYPE);
- setDisplayName(IosDevice::name());
+ setDefaultDisplayName(IosDevice::name());
setDisplayType(QCoreApplication::translate("Ios::Internal::IosDevice", "iOS"));
setMachineType(IDevice::Hardware);
setDeviceState(DeviceDisconnected);
@@ -98,7 +98,7 @@ IosDevice::IosDevice(const QString &uid)
{
setupId(IDevice::AutoDetected, Core::Id(Constants::IOS_DEVICE_ID).withSuffix(uid));
setType(Constants::IOS_DEVICE_TYPE);
- setDisplayName(IosDevice::name());
+ setDefaultDisplayName(IosDevice::name());
setDisplayType(QCoreApplication::translate("Ios::Internal::IosDevice", "iOS"));
setMachineType(IDevice::Hardware);
setDeviceState(DeviceDisconnected);
diff --git a/src/plugins/ios/iossimulator.cpp b/src/plugins/ios/iossimulator.cpp
index 4f63e8facc..4b88838d1f 100644
--- a/src/plugins/ios/iossimulator.cpp
+++ b/src/plugins/ios/iossimulator.cpp
@@ -50,7 +50,8 @@ IosSimulator::IosSimulator(Core::Id id)
setupId(IDevice::AutoDetected, id);
setType(Constants::IOS_SIMULATOR_TYPE);
setMachineType(IDevice::Emulator);
- setDisplayName(QCoreApplication::translate("Ios::Internal::IosSimulator", "iOS Simulator"));
+ setDefaultDisplayName(QCoreApplication::translate("Ios::Internal::IosSimulator",
+ "iOS Simulator"));
setDisplayType(QCoreApplication::translate("Ios::Internal::IosSimulator", "iOS Simulator"));
setDeviceState(DeviceReadyToUse);
}