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

iOS: Inline createIosToolChain()

Browse Source 
Plan is to only let the (base) factory create toolchains, having
the 'new' is a separate function complicates the process.

Change-Id: I1faff3e2ce4a19a2947ba4ac4e156ed56e5d18e5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2019-06-19 12:13:34 +02:00
parent 97392daaf3
commit 514e3776a1
1 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -575,29 +575,6 @@ ProvisioningProfilePtr IosConfigurations::provisioningProfile(const QString &pro
Utils::equal(&ProvisioningProfile::identifier, profileID)); Utils::equal(&ProvisioningProfile::identifier, profileID));
} }
static ClangToolChain *createIosToolChain(const XcodePlatform &platform,
const XcodePlatform::ToolchainTarget &target,
Core::Id l)
{
if (!l.isValid())
return nullptr;
if (l != Core::Id(ProjectExplorer::Constants::C_LANGUAGE_ID)
&& l != Core::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID))
return nullptr;
auto toolChain = new ClangToolChain;
toolChain->setDetection(ToolChain::AutoDetection);
toolChain->setLanguage(l);
toolChain->setDisplayName(target.name);
toolChain->setPlatformCodeGenFlags(target.backendFlags);
toolChain->setPlatformLinkerFlags(target.backendFlags);
toolChain->resetToolChain(l == Core::Id(ProjectExplorer::Constants::CXX_LANGUAGE_ID) ?
platform.cxxCompilerPath : platform.cCompilerPath);
return toolChain;
}
IosToolChainFactory::IosToolChainFactory() IosToolChainFactory::IosToolChainFactory()
{ {
setSupportedLanguages({ProjectExplorer::Constants::C_LANGUAGE_ID, setSupportedLanguages({ProjectExplorer::Constants::C_LANGUAGE_ID,
@@ -610,13 +587,20 @@ QList<ToolChain *> IosToolChainFactory::autoDetect(const QList<ToolChain *> &exi
const QList<XcodePlatform> platforms = XcodeProbe::detectPlatforms().values(); const QList<XcodePlatform> platforms = XcodeProbe::detectPlatforms().values();
QList<ToolChain *> toolChains; QList<ToolChain *> toolChains;
toolChains.reserve(platforms.size()); toolChains.reserve(platforms.size());
foreach (const XcodePlatform &platform, platforms) { for (const XcodePlatform &platform : platforms) {
for (const XcodePlatform::ToolchainTarget &target : platform.targets) { for (const XcodePlatform::ToolchainTarget &target : platform.targets) {
ToolChainPair platformToolchains = findToolChainForPlatform(platform, target, ToolChainPair platformToolchains = findToolChainForPlatform(platform, target,
existingClangToolChains); existingClangToolChains);
auto createOrAdd = [&](ClangToolChain* toolChain, Core::Id l) { auto createOrAdd = [&](ClangToolChain *toolChain, Core::Id l) {
if (!toolChain) { if (!toolChain) {
toolChain = createIosToolChain(platform, target, l); toolChain = new ClangToolChain;
toolChain->setDetection(ToolChain::AutoDetection);
toolChain->setLanguage(l);
toolChain->setDisplayName(target.name);
toolChain->setPlatformCodeGenFlags(target.backendFlags);
toolChain->setPlatformLinkerFlags(target.backendFlags);
toolChain->resetToolChain(l == ProjectExplorer::Constants::CXX_LANGUAGE_ID ?
platform.cxxCompilerPath : platform.cCompilerPath);
existingClangToolChains.append(toolChain); existingClangToolChains.append(toolChain);
} }
toolChains.append(toolChain); toolChains.append(toolChain);