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

Merge remote-tracking branch 'origin/3.3'

Browse Source
This commit is contained in:
Eike Ziller
2014-11-26 11:11:46 +01:00
parent cc035a59b1 26920307f0
commit 938326ef2c
39 changed files with 639 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/ios/iosconfigurations.cpp
View File

@@ -420,10 +420,11 @@ void IosConfigurations::updateSimulators()
DeviceManager *devManager = DeviceManager::instance();
Core::Id devId = Constants::IOS_SIMULATOR_DEVICE_ID;
IDevice::ConstPtr dev = devManager->find(devId);
if (!dev.isNull())
return;
IosSimulator *newDev = new IosSimulator(devId);
devManager->addDevice(IDevice::ConstPtr(newDev));
if (dev.isNull()) {
dev = IDevice::ConstPtr(new IosSimulator(devId));
devManager->addDevice(dev);
}
IosSimulator::updateAvailableDevices();
}
void IosConfigurations::setDeveloperPath(const FileName &devPath)