From 6652d937aa5d2648e63825c530339825051df4dc Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Thu, 23 Aug 2018 15:51:56 +0200 Subject: [PATCH] Clang: Fix excluded Clang path regular expression Cover cases like /usr/lib64/clang/6.0.0/include Change-Id: I015ea3535637376eeab6f737752ad13d33887190 Reviewed-by: Marco Bubke --- src/plugins/cpptools/compileroptionsbuilder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index aeb60a0f282..8a1434cce96 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(); }