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

Merge remote-tracking branch 'origin/3.0'

Browse Source
This commit is contained in:
Eike Ziller
2013-12-12 10:06:09 +01:00
parent dcfc89f8a8 79e1291129
commit dad0140134
6 changed files with 4759 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,8 +246,7 @@ void IosConfigurations::updateAutomaticKitList()
foreach (Kit *k, KitManager::kits()) {
Core::Id deviceKind = DeviceTypeKitInformation::deviceTypeId(k);
if (deviceKind != Constants::IOS_DEVICE_TYPE
&& deviceKind != Constants::IOS_SIMULATOR_TYPE
&& deviceKind != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) {
&& deviceKind != Constants::IOS_SIMULATOR_TYPE) {
if (debugProbe)
qDebug() << "skipping existing kit with deviceKind " << deviceKind.toString();
continue;