diff options
author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-09-17 09:26:56 +0200 |
---|---|---|
committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-09-17 13:13:16 +0000 |
commit | eeece5b5adbfeee3e9924052f6e34d5f4ef642b9 (patch) | |
tree | 601dfe9db53a85347f970b74708c9ad10b0f316c /src/plugins/cpptools/compileroptionsbuilder.cpp | |
parent | 0bd095aa4550eac51d026c96e5128720bf867a41 (diff) | |
download | qt-creator-eeece5b5adbfeee3e9924052f6e34d5f4ef642b9.tar.gz |
Clang: Skip built-in includes when exporting the compilation database
We don't want to have compiler-specific paths there.
Change-Id: If26434ea3760d4f2ca4c25bbcf0340f4ea781072
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
-rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index 38fa94e83d..d4d36fa806 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -43,12 +43,14 @@ namespace CppTools { CompilerOptionsBuilder::CompilerOptionsBuilder(const ProjectPart &projectPart, UseSystemHeader useSystemHeader, + SkipBuiltIn skipBuiltInHeaderPaths, QString clangVersion, QString clangResourceDirectory) : m_projectPart(projectPart) , m_useSystemHeader(useSystemHeader) , m_clangVersion(clangVersion) , m_clangResourceDirectory(clangResourceDirectory) + , m_skipBuiltInHeaderPaths(skipBuiltInHeaderPaths) { } @@ -237,7 +239,8 @@ void CompilerOptionsBuilder::addHeaderPathOptions() m_options.append(includes); m_options.append(systemIncludes); - m_options.append(builtInIncludes); + if (m_skipBuiltInHeaderPaths == SkipBuiltIn::No) + m_options.append(builtInIncludes); } void CompilerOptionsBuilder::addPrecompiledHeaderOptions(PchUsage pchUsage) |