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

ios: ensure that device and simulator scan with a developerPath

Browse Source 
Change-Id: Ifcc8d8f5c389c963ee1b6c2d2d2437bd5429f843
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
This commit is contained in:
Christian Stenger
2014-11-25 15:42:26 +01:00
committed by Fawzi Mohamed
parent 6376d01e8b
commit a1f8bc4c5f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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