diff options
| author | Eike Ziller <[email protected]> | 2016-10-17 16:16:07 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2016-10-17 16:16:07 +0200 |
| commit | 02a39c013f2c4c5a82ac38c32d565c5426fcc450 (patch) | |
| tree | 0a654bd85c9fb9469648ae716a673d9c1624420e /src/plugins/ios/iosrunconfiguration.cpp | |
| parent | f4994a5f76fead64cb098cee4e5c9b75fa16242c (diff) | |
| parent | 28341ac3f1b1a8f4a13e210eaf4f2d066b30e857 (diff) | |
Merge remote-tracking branch 'origin/4.1' into 4.2
Conflicts:
src/plugins/ios/iostoolhandler.cpp
src/shared/qbs
src/tools/3rdparty/iossim/iossim.qbs
src/tools/3rdparty/iossim_1_8_2/main.mm
Change-Id: Ied9cafec4f1ee93d9e524f095f5c6b1480b2f054
Diffstat (limited to 'src/plugins/ios/iosrunconfiguration.cpp')
| -rw-r--r-- | src/plugins/ios/iosrunconfiguration.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index 06f37074ee6..e6e70108745 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -27,6 +27,7 @@ #include "iosconstants.h" #include "iosmanager.h" #include "iosdeploystep.h" +#include "simulatorcontrol.h" #include <projectexplorer/kitinformation.h> #include <projectexplorer/target.h> @@ -346,7 +347,7 @@ IosDeviceType IosRunConfiguration::deviceType() const { QList<IosDeviceType> availableSimulators; if (m_deviceType.type == IosDeviceType::SimulatedDevice) - availableSimulators = IosSimulator::availableDevices(); + availableSimulators = SimulatorControl::availableSimulators(); if (!availableSimulators.isEmpty()) { QList<IosDeviceType> elegibleDevices; QString devname = m_deviceType.identifier.split(QLatin1Char(',')).value(0); @@ -417,7 +418,7 @@ void IosRunConfigurationWidget::updateValues() m_deviceTypeLabel->setVisible(showDeviceSelector); m_deviceTypeComboBox->setVisible(showDeviceSelector); if (showDeviceSelector && m_deviceTypeModel.rowCount() == 0) { - foreach (const IosDeviceType &dType, IosSimulator::availableDevices()) { + foreach (const IosDeviceType &dType, SimulatorControl::availableSimulators()) { QStandardItem *item = new QStandardItem(dType.displayName); QVariant v; v.setValue(dType); |