feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangTools: Do not include our wrapped Qt headers

Browse Source 
These are only necessary for the code model and can prevent clazy from
finding certain issues.

Fixes: QTCREATORBUG-24845
Change-Id: I04ba6703812918c39ebbde1dbac5af85fe18622d
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2020-10-28 12:10:55 +01:00
parent d2ebc16b92
commit 7b6ab79f3e
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangtools/clangtoolruncontrol.cpp
View File

@@ -121,7 +121,7 @@ AnalyzeUnit::AnalyzeUnit(const FileInfo &fileInfo,
{ {
CompilerOptionsBuilder optionsBuilder(*fileInfo.projectPart, CompilerOptionsBuilder optionsBuilder(*fileInfo.projectPart,
UseSystemHeader::No, UseSystemHeader::No,
UseTweakedHeaderPaths::Yes, UseTweakedHeaderPaths::Tools,
UseLanguageDefines::No, UseLanguageDefines::No,
UseBuildSystemWarnings::No, UseBuildSystemWarnings::No,
clangVersion, clangVersion,

3
src/plugins/cpptools/compileroptionsbuilder.cpp
View File

@@ -298,7 +298,8 @@ void CompilerOptionsBuilder::enableExceptions()
void CompilerOptionsBuilder::insertWrappedQtHeaders() void CompilerOptionsBuilder::insertWrappedQtHeaders()
{ {
insertWrappedHeaders(wrappedQtHeadersIncludePath()); if (m_useTweakedHeaderPaths == UseTweakedHeaderPaths::Yes)
insertWrappedHeaders(wrappedQtHeadersIncludePath());
} }
void CompilerOptionsBuilder::insertWrappedMingwHeaders() void CompilerOptionsBuilder::insertWrappedMingwHeaders()

2
src/plugins/cpptools/compileroptionsbuilder.h
View File

@@ -33,7 +33,7 @@ namespace CppTools {
enum class UsePrecompiledHeaders : char { Yes, No }; enum class UsePrecompiledHeaders : char { Yes, No };
enum class UseSystemHeader : char { Yes, No }; enum class UseSystemHeader : char { Yes, No };
enum class UseTweakedHeaderPaths : char { Yes, No }; enum class UseTweakedHeaderPaths : char { Yes, Tools, No };
enum class UseToolchainMacros : char { Yes, No }; enum class UseToolchainMacros : char { Yes, No };
enum class UseLanguageDefines : char { Yes, No }; enum class UseLanguageDefines : char { Yes, No };
enum class UseBuildSystemWarnings : char { Yes, No }; enum class UseBuildSystemWarnings : char { Yes, No };