feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

iOS: Avoid double-indirection between DeviceTypeAspect and run config

Browse Source 
No need to leave the aspect context.

Change-Id: I96a93f7c85d8bbb1fdc28352a4c70a29bc510e4c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-08-29 18:03:48 +02:00
parent c343d98215
commit 335ea0c831
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/ios/iosrunconfiguration.cpp
View File

@@ -346,7 +346,7 @@ void IosDeviceTypeAspect::setDeviceTypeIndex(int devIndex)
void IosDeviceTypeAspect::updateValues() void IosDeviceTypeAspect::updateValues()
{ {
bool showDeviceSelector = m_runConfiguration->deviceType().type != IosDeviceType::IosDevice; bool showDeviceSelector = deviceType().type != IosDeviceType::IosDevice;
m_deviceTypeLabel->setVisible(showDeviceSelector); m_deviceTypeLabel->setVisible(showDeviceSelector);
m_deviceTypeComboBox->setVisible(showDeviceSelector); m_deviceTypeComboBox->setVisible(showDeviceSelector);
if (showDeviceSelector && m_deviceTypeModel.rowCount() == 0) { 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(); QVariant currentData = m_deviceTypeComboBox->currentData();
if (currentDType.type == IosDeviceType::SimulatedDevice && !currentDType.identifier.isEmpty() if (currentDType.type == IosDeviceType::SimulatedDevice && !currentDType.identifier.isEmpty()
&& (!currentData.isValid() && (!currentData.isValid()