JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26857cc851
nixpkgs/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch

16 lines
896 B
Diff
Raw Normal View History

qtcreator: add clang code model compilation Clang code model provides user with services: code completion, syntactic and semantic highlighting, diagnostics, outline of symbols, tooltips, renaming of local symbols. It's naturally depends on llvm and clang. To make it work with nixos: 1. Add qt version of clang as build dependency. 2. Added patch for clang libc++ regexp trunk regexp not including path like "libc++-version". 3. Fixed paths to llvm/clang libraries and includes. 4. Fixed name of clazy clang plugin.
2019-05-07 15:18:21 +01:00
diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp
qtcreator: 4.10.0 -> 4.11.0
2019-12-21 16:28:12 +00:00
index b656f8e1..a830d3c3 100644
qtcreator: add clang code model compilation Clang code model provides user with services: code completion, syntactic and semantic highlighting, diagnostics, outline of symbols, tooltips, renaming of local symbols. It's naturally depends on llvm and clang. To make it work with nixos: 1. Add qt version of clang as build dependency. 2. Added patch for clang libc++ regexp trunk regexp not including path like "libc++-version". 3. Fixed paths to llvm/clang libraries and includes. 4. Fixed name of clazy clang plugin.
2019-05-07 15:18:21 +01:00
--- a/src/plugins/cpptools/headerpathfilter.cpp
+++ b/src/plugins/cpptools/headerpathfilter.cpp
qtcreator: 4.10.0 -> 4.11.0
2019-12-21 16:28:12 +00:00
@@ -124,8 +124,8 @@ HeaderPaths::iterator resourceIterator(HeaderPaths &headerPaths)
qtcreator: add clang code model compilation Clang code model provides user with services: code completion, syntactic and semantic highlighting, diagnostics, outline of symbols, tooltips, renaming of local symbols. It's naturally depends on llvm and clang. To make it work with nixos: 1. Add qt version of clang as build dependency. 2. Added patch for clang libc++ regexp trunk regexp not including path like "libc++-version". 3. Fixed paths to llvm/clang libraries and includes. 4. Fixed name of clazy clang plugin.
2019-05-07 15:18:21 +01:00
{
// include/c++, include/g++, libc++\include and libc++abi\include
qtcreator: 4.10.0 -> 4.11.0
2019-12-21 16:28:12 +00:00
static const QString cppIncludes = R"((.*/include/.*(g\+\+|c\+\+).*))"
- R"(|(.*libc\+\+/include))"
- R"(|(.*libc\+\+abi/include))"
qtcreator: add clang code model compilation Clang code model provides user with services: code completion, syntactic and semantic highlighting, diagnostics, outline of symbols, tooltips, renaming of local symbols. It's naturally depends on llvm and clang. To make it work with nixos: 1. Add qt version of clang as build dependency. 2. Added patch for clang libc++ regexp trunk regexp not including path like "libc++-version". 3. Fixed paths to llvm/clang libraries and includes. 4. Fixed name of clazy clang plugin.
2019-05-07 15:18:21 +01:00
+ R"(|(.*libc\+\+.*\/include))"
+ R"(|(.*libc\+\+abi.*\/include))";
qtcreator: 4.10.0 -> 4.11.0
2019-12-21 16:28:12 +00:00
R"(|(/usr/local/include))";
qtcreator: add clang code model compilation Clang code model provides user with services: code completion, syntactic and semantic highlighting, diagnostics, outline of symbols, tooltips, renaming of local symbols. It's naturally depends on llvm and clang. To make it work with nixos: 1. Add qt version of clang as build dependency. 2. Added patch for clang libc++ regexp trunk regexp not including path like "libc++-version". 3. Fixed paths to llvm/clang libraries and includes. 4. Fixed name of clazy clang plugin.
2019-05-07 15:18:21 +01:00
static const QRegularExpression includeRegExp("\\A(" + cppIncludes + ")\\z");
Reference in New Issue Copy Permalink