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

ios: avoid adding toolchains that we don't use in the kits

Browse Source 
Change-Id: Ic6f13dea277500fc9d3c3fb3b08069998d4b65ce
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Fawzi Mohamed
2013-11-05 19:21:16 +01:00
parent 447afbf0b8
commit 34b875e107
1 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,6 +81,23 @@ void IosConfigurations::updateAutomaticKitList()
break; break;
} }
} }
// filter out all non iphone, non base, non clang or cxx11 platforms, as we don't set up kits for those
{
QMap<QString, Platform>::iterator iter(platforms.begin());
while (iter != platforms.end()) {
const Platform &p = iter.value();
if (!p.name.startsWith(QLatin1String("iphone")) || (p.platformKind & Platform::BasePlatform) == 0
|| (p.platformKind & Platform::Cxx11Support) != 0
|| !p.compilerPath.toString().contains(QLatin1String("clang")))
iter = platforms.erase(iter);
else {
if (debugProbe)
qDebug() << "keeping" << p.name << " " << p.compilerPath.toString() << " "
<< p.backendFlags;
++iter;
}
}
}
QMap<QString, GccToolChain *> platformToolchainMap; QMap<QString, GccToolChain *> platformToolchainMap;
// check existing toolchains (and remove old ones) // check existing toolchains (and remove old ones)
@@ -135,10 +152,7 @@ void IosConfigurations::updateAutomaticKitList()
while (iter.hasNext()) { while (iter.hasNext()) {
iter.next(); iter.next();
const Platform &p = iter.value(); const Platform &p = iter.value();
if (platformToolchainMap.contains(p.name) if (platformToolchainMap.contains(p.name))
|| (p.platformKind & Platform::BasePlatform) == 0
|| (p.name.startsWith(QLatin1String("iphone"))
&& (p.platformKind & Platform::Cxx11Support) != 0))
continue; continue;
GccToolChain *toolchain; GccToolChain *toolchain;
if (p.compilerPath.toFileInfo().baseName().startsWith(QLatin1String("clang"))) if (p.compilerPath.toFileInfo().baseName().startsWith(QLatin1String("clang")))
@@ -186,27 +200,6 @@ void IosConfigurations::updateAutomaticKitList()
} }
} }
} }
// filter out all non iphone, non base, non clang or cxx11 platforms, as we don't set up kits for those
{
QStringList toRemove;
QMapIterator<QString, Platform> iter(platforms);
while (iter.hasNext()) {
iter.next();
const Platform &p = iter.value();
if (!p.name.startsWith(QLatin1String("iphone")) || (p.platformKind & Platform::BasePlatform) == 0
|| (p.platformKind & Platform::Cxx11Support) != 0
|| !p.compilerPath.toString().contains(QLatin1String("clang")))
toRemove.append(p.name);
else if (debugProbe)
qDebug() << "keeping" << p.name << " " << p.compilerPath.toString() << " "
<< p.backendFlags;
}
foreach (const QString &pName, toRemove) {
if (debugProbe)
qDebug() << "filtering out " << pName;
platforms.remove(pName);
}
}
QMap<Abi::Architecture, QList<BaseQtVersion *> > qtVersionsForArch; QMap<Abi::Architecture, QList<BaseQtVersion *> > qtVersionsForArch;
foreach (BaseQtVersion *qtVersion, QtVersionManager::versions()) { foreach (BaseQtVersion *qtVersion, QtVersionManager::versions()) {
if (debugProbe) if (debugProbe)