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

ToolChainKitInformation: Remove setToolChain(kit, language, toolchain)

Browse Source 
Replace that with clearToolChain(kit, languguage). The only use-case
for that method was to unset toolchains in a kit.

Change-Id: I8cffe39393281f424fa8e044e6b90c5cea17ac90
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2016-12-12 17:13:29 +01:00
parent 68f0d637a6
commit 43c6e97529
5 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,8 +186,15 @@ static void setupKit(Kit *kit, Core::Id pDeviceType, const ToolChainPair& toolCh
const QVariant &debuggerId, const Utils::FileName &sdkPath, BaseQtVersion *qtVersion)
{
DeviceTypeKitInformation::setDeviceTypeId(kit, pDeviceType);
ToolChainKitInformation::setToolChain(kit, ToolChain::Language::C, toolChains.first);
ToolChainKitInformation::setToolChain(kit, ToolChain::Language::Cxx, toolChains.second);
if (toolChains.first)
ToolChainKitInformation::setToolChain(kit, toolChains.first);
else
ToolChainKitInformation::clearToolChain(kit, ToolChain::Language::C);
if (toolChains.second)
ToolChainKitInformation::setToolChain(kit, toolChains.second);
else
ToolChainKitInformation::clearToolChain(kit, ToolChain::Language::Cxx);
QtKitInformation::setQtVersion(kit, qtVersion);
// only replace debugger with the default one if we find an unusable one here
// (since the user could have changed it)