nixpkgs/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch
Andrew Newman 1eafac2ac6 qtcreator 4.9.1 -> 4.10.0 (#70573)
Added optional withClangPlugins to disable clang plugins compilation
and, therefore, vendor clang dependency.
2019-11-05 12:00:42 -05:00

15 lines
913 B
Diff

diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp
index e2d1e6a..1a1d839 100644
--- a/src/plugins/cpptools/headerpathfilter.cpp
+++ b/src/plugins/cpptools/headerpathfilter.cpp
@@ -96,8 +96,8 @@ HeaderPaths::iterator resourceIterator(HeaderPaths &headerPaths, bool isMacOs)
{
// include/c++, include/g++, libc++\include and libc++abi\include
static const QString cppIncludes = R"((.*\/include\/.*(g\+\+|c\+\+).*))"
- R"(|(.*libc\+\+\/include))"
- R"(|(.*libc\+\+abi\/include))";
+ R"(|(.*libc\+\+.*\/include))"
+ R"(|(.*libc\+\+abi.*\/include))";
static const QRegularExpression includeRegExp("\\A(" + cppIncludes + ")\\z");
// The same as includeRegExp but also matches /usr/local/include