diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-12-05 09:23:29 +0100 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-12-10 10:25:22 +0000 |
| commit | f6b8302efdcf62677fbf35873ac8b42d485868b6 (patch) | |
| tree | e54a9c1d58e1d2c1964f56bb7efeca430cf0259d /src/plugins/clangcodemodel/clangutils.cpp | |
| parent | 134bb1b8b61aea6499069fb21e272f4a2ac7ff98 (diff) | |
Clang: Stop forwarding toolchain macros
...for clang code model and clang tools use case.
This means that compiler detection code will see clang now instead of
the toolchain that is configured in the kit. While providing the
toolchain macros worked fine for the general case, it always was
problematic for compiler detection code.
By not providing the toolchain macros we are more close to the real
clang compiler invocation. That is, rely on clang to do the right thing.
Allow to go back to old behavior with QTC_CLANG_USE_TOOLCHAIN_MACROS=1
as this will be useful checking differences for debugging.
Fixes: QTCREATORBUG-19543
Change-Id: I23ffd761d83f35ca1a22269c3ef07a2dc62358bd
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Diffstat (limited to 'src/plugins/clangcodemodel/clangutils.cpp')
| -rw-r--r-- | src/plugins/clangcodemodel/clangutils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp index 91770b9557..daed860fb9 100644 --- a/src/plugins/clangcodemodel/clangutils.cpp +++ b/src/plugins/clangcodemodel/clangutils.cpp @@ -69,7 +69,7 @@ public: LibClangOptionsBuilder(const ProjectPart &projectPart) : CompilerOptionsBuilder(projectPart, UseSystemHeader::No, - UseToolchainMacros::Yes, + useToolChainMacros(), UseTweakedHeaderPaths::Yes, UseLanguageDefines::No, QString(CLANG_VERSION), |