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-12-01 15:44:30 +01:00
parent 34a48645c5 d93afdeda5
commit d341c48246
55 changed files with 699 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -369,8 +369,6 @@ void IosConfigurations::initialize()
{
QTC_CHECK(m_instance == 0);
m_instance = new IosConfigurations(0);
m_instance->updateSimulators();
QTimer::singleShot(10000, IosDeviceManager::instance(), SLOT(monitorAvailableDevices()));
}
bool IosConfigurations::ignoreAllDevices()
@@ -429,10 +427,15 @@ void IosConfigurations::updateSimulators()
void IosConfigurations::setDeveloperPath(const FileName &devPath)
{
static bool hasDevPath = false;
if (devPath != m_instance->m_developerPath) {
m_instance->m_developerPath = devPath;
m_instance->save();
updateAutomaticKitList();
if (!hasDevPath && !devPath.isEmpty()) {
hasDevPath = true;
QTimer::singleShot(1000, IosDeviceManager::instance(), SLOT(monitorAvailableDevices()));
m_instance->updateSimulators();
}
emit m_instance->updated();
}
}