From 335ea0c8318c003c14dee4766ca272232302a4f1 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 29 Aug 2019 18:03:48 +0200 Subject: [PATCH] iOS: Avoid double-indirection between DeviceTypeAspect and run config No need to leave the aspect context. Change-Id: I96a93f7c85d8bbb1fdc28352a4c70a29bc510e4c Reviewed-by: Eike Ziller --- src/plugins/ios/iosrunconfiguration.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index d25da00fd99..b49f383051b 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -346,7 +346,7 @@ void IosDeviceTypeAspect::setDeviceTypeIndex(int devIndex) void IosDeviceTypeAspect::updateValues() { - bool showDeviceSelector = m_runConfiguration->deviceType().type != IosDeviceType::IosDevice; + bool showDeviceSelector = deviceType().type != IosDeviceType::IosDevice; m_deviceTypeLabel->setVisible(showDeviceSelector); m_deviceTypeComboBox->setVisible(showDeviceSelector); if (showDeviceSelector && m_deviceTypeModel.rowCount() == 0) { @@ -359,7 +359,7 @@ void IosDeviceTypeAspect::updateValues() } } - IosDeviceType currentDType = m_runConfiguration->deviceType(); + IosDeviceType currentDType = deviceType(); QVariant currentData = m_deviceTypeComboBox->currentData(); if (currentDType.type == IosDeviceType::SimulatedDevice && !currentDType.identifier.isEmpty() && (!currentData.isValid()