diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-08-24 11:37:28 +0200 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-08-28 10:23:34 +0000 |
| commit | efe7c56e625f82afb6e5e2247c20d1bb796897e4 (patch) | |
| tree | 217c5a46a1cf0df7563a85efb3b18e1267c9d5b1 /src/plugins/cpptools/compileroptionsbuilder.cpp | |
| parent | 21b2c1d04acf2ed71734c59bb1047fabd41291fb (diff) | |
| download | qt-creator-efe7c56e625f82afb6e5e2247c20d1bb796897e4.tar.gz | |
Clang: Do not add -undef to ClangCodeModel arguments with clang-cl
Clang-cl behaves similar to MSVC and the parsing is more proper
without -undef specified.
Change-Id: Iee37fca3401000edb3e77e8a99dcb85ae6e70ab3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index d63aaa0951..25b64f58e1 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -620,8 +620,10 @@ void CompilerOptionsBuilder::addWrappedQtHeadersIncludePath(QStringList &list) void CompilerOptionsBuilder::addGlobalUndef() { // In case of MSVC we need builtin clang defines to correctly handle clang includes - if (m_projectPart.toolchainType != ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID) + if (m_projectPart.toolchainType != ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID + && m_projectPart.toolchainType != ProjectExplorer::Constants::CLANG_CL_TOOLCHAIN_TYPEID) { add("-undef"); + } } void CompilerOptionsBuilder::addProjectConfigFileInclude() |