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

iosrunconfiguration: always update dev type switcher

Browse Source 
Change-Id: I9c9956f20b33274f193fc69639ed7461ba96ff9f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-04-01 18:40:56 +02:00
parent 34d1826263
commit 415602e04d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,10 +101,7 @@ void IosRunConfiguration::init()
m_parseInProgress = project->parseInProgress(m_profilePath); m_parseInProgress = project->parseInProgress(m_profilePath);
m_lastIsEnabled = isEnabled(); m_lastIsEnabled = isEnabled();
m_lastDisabledReason = disabledReason(); m_lastDisabledReason = disabledReason();
if (DeviceTypeKitInformation::deviceTypeId(target()->kit()) == Constants::IOS_DEVICE_TYPE) m_deviceType = IosDeviceType::IosDevice;
m_deviceType = IosDeviceType::IosDevice;
else
m_deviceType = IosDeviceType::SimulatedIphoneRetina4Inch;
updateDisplayNames(); updateDisplayNames();
connect(DeviceManager::instance(), SIGNAL(updated()), connect(DeviceManager::instance(), SIGNAL(updated()),
SLOT(deviceChanges())); SLOT(deviceChanges()));
@@ -161,6 +158,10 @@ QStringList IosRunConfiguration::commandLineArguments()
void IosRunConfiguration::updateDisplayNames() 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::IDevice::ConstPtr dev =
ProjectExplorer::DeviceKitInformation::device(target()->kit()); ProjectExplorer::DeviceKitInformation::device(target()->kit());
const QString devName = dev.isNull() ? IosDevice::name() : dev->displayName(); 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(new Ui::IosRunConfiguration), m_runConfiguration(runConfiguration)
{ {
m_ui->setupUi(this); m_ui->setupUi(this);
if (m_runConfiguration->deviceType() == IosDeviceType::IosDevice) {
m_ui->deviceTypeLabel->setVisible(false);
m_ui->deviceTypeComboBox->setVisible(false);
}
updateValues(); updateValues();
connect(m_ui->deviceTypeComboBox, SIGNAL(currentIndexChanged(int)), connect(m_ui->deviceTypeComboBox, SIGNAL(currentIndexChanged(int)),
@@ -447,6 +444,9 @@ void IosRunConfigurationWidget::setDeviceTypeIndex(int devIndex)
void IosRunConfigurationWidget::updateValues() 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(); QStringList args = m_runConfiguration->commandLineArguments();
QString argsString = argListToString(args); QString argsString = argListToString(args);