diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2016-07-12 16:27:45 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2016-07-14 15:34:06 +0000 |
| commit | cb14fb0d715f22b32fb9880fd26e20715fcdc5a7 (patch) | |
| tree | 9abb67bb500505de5c813aba8d6b92a6793a4847 /src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp | |
| parent | ce9ca1f0ef4af4695e6c57983fc89a8bbc49976d (diff) | |
| download | qt-creator-cb14fb0d715f22b32fb9880fd26e20715fcdc5a7.tar.gz | |
Kits: Save several ToolChains per kit
BREAKS BACKWARD COMPATIBILITY OF TOOLCHAIN SETTINGS!
* Convert old ToolChainKitInformation to new version
* Store several toolchains in one kit (one per language)
Change-Id: Ia59a2ad067c57971ec34ce9b2e43758344443755
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp')
| -rw-r--r-- | src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp index 1987ae8679..f55aa29e39 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp @@ -83,7 +83,7 @@ ClangStaticAnalyzerRunControl::ClangStaticAnalyzerRunControl( QTC_ASSERT(buildConfiguration, return); m_environment = buildConfiguration->environment(); - ToolChain *toolChain = ToolChainKitInformation::toolChain(target->kit()); + ToolChain *toolChain = ToolChainKitInformation::toolChain(target->kit(), ToolChain::Language::Cxx); QTC_ASSERT(toolChain, return); m_extraToolChainInfo.wordWidth = toolChain->targetAbi().wordWidth(); m_extraToolChainInfo.targetTriple = toolChain->originalTargetTriple(); @@ -427,7 +427,7 @@ static QDebug operator<<(QDebug debug, const AnalyzeUnits &analyzeUnits) static Core::Id toolchainType(ProjectExplorer::RunConfiguration *runConfiguration) { QTC_ASSERT(runConfiguration, return Core::Id()); - return ToolChainKitInformation::toolChain(runConfiguration->target()->kit())->typeId(); + return ToolChainKitInformation::toolChain(runConfiguration->target()->kit(), ToolChain::Language::Cxx)->typeId(); } void ClangStaticAnalyzerRunControl::start() |