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

Clang: Fix excluded Clang path regular expression

Browse Source 
Cover cases like /usr/lib64/clang/6.0.0/include

Change-Id: I015ea3535637376eeab6f737752ad13d33887190
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-08-23 15:51:56 +02:00
parent 468e71cbe4
commit 6652d937aa
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -505,7 +505,7 @@ bool CompilerOptionsBuilder::excludeHeaderPath(const QString &headerPath) const
// For example GCC on macOS uses system clang include path which makes clang code model // For example GCC on macOS uses system clang include path which makes clang code model
// include incorrect system headers. // include incorrect system headers.
static QRegularExpression clangIncludeDir( static QRegularExpression clangIncludeDir(
QLatin1String("\\A.*/lib/clang/\\d+\\.\\d+(\\.\\d+)?/include\\z")); QLatin1String("\\A.*[\\/\\\\]lib\\d*[\\/\\\\]clang[\\/\\\\]\\d+\\.\\d+(\\.\\d+)?[\\/\\\\]include\\z"));
return clangIncludeDir.match(headerPath).hasMatch(); return clangIncludeDir.match(headerPath).hasMatch();
} }