summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@digia.com>2014-11-25 15:42:26 +0100
committerFawzi Mohamed <fawzi.mohamed@theqtcompany.com>2014-11-26 13:36:59 +0100
commita1f8bc4c5fe1f1098c5b6ee67d098d23d7c77f17 (patch)
tree36da83d7bef684a5c69ac4739aed905b96fe010d
parent6376d01e8bd0c26ba882fd29228041946c01780c (diff)
downloadqt-creator-a1f8bc4c5fe1f1098c5b6ee67d098d23d7c77f17.tar.gz
ios: ensure that device and simulator scan with a developerPath
Change-Id: Ifcc8d8f5c389c963ee1b6c2d2d2437bd5429f843 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
-rw-r--r--src/plugins/ios/iosconfigurations.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp
index c980c34002..8b0772ca67 100644
--- a/src/plugins/ios/iosconfigurations.cpp
+++ b/src/plugins/ios/iosconfigurations.cpp
@@ -362,8 +362,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()
@@ -422,10 +420,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();
}
}