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

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Change-Id: I68512c775ed25b51c8b0abe1818c9c7c5955874c
This commit is contained in:
Eike Ziller
2015-10-30 16:07:56 +01:00
parent e60f62c131 9fc4396e11
commit 310ae09996
95 changed files with 1696 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,10 +375,10 @@ QList<ToolChain *> IosToolChainFactory::autoDetect(const QList<ToolChain *> &exi
foreach (const Platform &platform, platforms) {
ClangToolChain *toolChain = findToolChainForPlatform(platform, existingClangToolChains);
if (!toolChain) {
ClangToolChain *newToolChain = createToolChain(platform);
toolChains.append(newToolChain);
existingClangToolChains.append(newToolChain);
toolChain = createToolChain(platform);
existingClangToolChains.append(toolChain);
}
toolChains.append(toolChain);
}
return Utils::transform(toolChains, [](ClangToolChain *tc) -> ToolChain * { return tc; });
}