summaryrefslogtreecommitdiff
path: root/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp')
-rw-r--r--plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
index 6403e5f1c8..20ac43d393 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
@@ -144,14 +144,14 @@ public:
// will break if code actually requires stuff from there, but that should be the less common
// case.
const Core::Id type = projectPart->toolchainType;
- if (type == ProjectExplorer::Constants::MINGW_TOOLCHAIN_ID
- || type == ProjectExplorer::Constants::GCC_TOOLCHAIN_ID)
+ if (type == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID
+ || type == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID)
optionsBuilder.addDefine("#define _X86INTRIN_H_INCLUDED\n");
optionsBuilder.addToolchainAndProjectDefines();
optionsBuilder.addHeaderPathOptions();
- if (type == ProjectExplorer::Constants::MSVC_TOOLCHAIN_ID)
+ if (type == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)
optionsBuilder.add(QLatin1String("/EHsc")); // clang-cl does not understand exceptions
else
optionsBuilder.add(QLatin1String("-fPIC")); // TODO: Remove?
@@ -164,7 +164,7 @@ public:
private:
ClangStaticAnalyzerOptionsBuilder(const CppTools::ProjectPart::Ptr &projectPart)
: CompilerOptionsBuilder(projectPart)
- , m_isMsvcToolchain(m_projectPart->toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_ID)
+ , m_isMsvcToolchain(m_projectPart->toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID)
{
}