From 415602e04d11d9944ecc363f4eab53c51a68b631 Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@digia.com>
Date: Tue, 1 Apr 2014 18:40:56 +0200
Subject: [PATCH] iosrunconfiguration: always update dev type switcher
Change-Id: I9c9956f20b33274f193fc69639ed7461ba96ff9f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
---
src/plugins/ios/iosrunconfiguration.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp
index 780d8a7240f..0eae80b0724 100644
--- a/src/plugins/ios/iosrunconfiguration.cpp
+++ b/src/plugins/ios/iosrunconfiguration.cpp
@@ -101,10 +101,7 @@ void IosRunConfiguration::init()
m_parseInProgress = project->parseInProgress(m_profilePath);
m_lastIsEnabled = isEnabled();
m_lastDisabledReason = disabledReason();
- if (DeviceTypeKitInformation::deviceTypeId(target()->kit()) == Constants::IOS_DEVICE_TYPE)
- m_deviceType = IosDeviceType::IosDevice;
- else
- m_deviceType = IosDeviceType::SimulatedIphoneRetina4Inch;
+ m_deviceType = IosDeviceType::IosDevice;
updateDisplayNames();
connect(DeviceManager::instance(), SIGNAL(updated()),
SLOT(deviceChanges()));
@@ -161,6 +158,10 @@ QStringList IosRunConfiguration::commandLineArguments()
void IosRunConfiguration::updateDisplayNames()
{
+ if (DeviceTypeKitInformation::deviceTypeId(target()->kit()) == Constants::IOS_DEVICE_TYPE)
+ m_deviceType = IosDeviceType::IosDevice;
+ else if (m_deviceType == IosDeviceType::IosDevice)
+ m_deviceType = IosDeviceType::SimulatedIphoneRetina4Inch;
ProjectExplorer::IDevice::ConstPtr dev =
ProjectExplorer::DeviceKitInformation::device(target()->kit());
const QString devName = dev.isNull() ? IosDevice::name() : dev->displayName();
@@ -370,10 +371,6 @@ IosRunConfigurationWidget::IosRunConfigurationWidget(IosRunConfiguration *runCon
m_ui(new Ui::IosRunConfiguration), m_runConfiguration(runConfiguration)
{
m_ui->setupUi(this);
- if (m_runConfiguration->deviceType() == IosDeviceType::IosDevice) {
- m_ui->deviceTypeLabel->setVisible(false);
- m_ui->deviceTypeComboBox->setVisible(false);
- }
updateValues();
connect(m_ui->deviceTypeComboBox, SIGNAL(currentIndexChanged(int)),
@@ -447,6 +444,9 @@ void IosRunConfigurationWidget::setDeviceTypeIndex(int devIndex)
void IosRunConfigurationWidget::updateValues()
{
+ bool showDeviceSelector = m_runConfiguration->deviceType() != IosDeviceType::IosDevice;
+ m_ui->deviceTypeLabel->setVisible(showDeviceSelector);
+ m_ui->deviceTypeComboBox->setVisible(showDeviceSelector);
QStringList args = m_runConfiguration->commandLineArguments();
QString argsString = argListToString(args);
--
GitLab