diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-08-23 15:51:56 +0200 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-08-24 05:46:07 +0000 |
| commit | 6652d937aa5d2648e63825c530339825051df4dc (patch) | |
| tree | 207f4b10325f6c186ced749c6e518f3141991acd /src/plugins/cpptools/compileroptionsbuilder.cpp | |
| parent | 468e71cbe44e4b232b7f9ecb95e18f73e3463577 (diff) | |
| download | qt-creator-6652d937aa5d2648e63825c530339825051df4dc.tar.gz | |
Clang: Fix excluded Clang path regular expression
Cover cases like /usr/lib64/clang/6.0.0/include
Change-Id: I015ea3535637376eeab6f737752ad13d33887190
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index aeb60a0f28..8a1434cce9 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -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 // include incorrect system headers. 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(); } |