ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

qtcreator: 4.10.0 -> 4.11.0

Browse Source
This commit is contained in:
Andrew Newman 2019-12-21 19:28:12 +03:00
parent 2095b4de34
commit 0dc0af5f31
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch
View File

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

9
pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch
View File

@ -1,13 +1,12 @@
diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp
index e2d1e6a..1a1d839 100644 index a830d3c3..80e2f933 100644
--- a/src/plugins/cpptools/headerpathfilter.cpp --- a/src/plugins/cpptools/headerpathfilter.cpp
+++ b/src/plugins/cpptools/headerpathfilter.cpp +++ b/src/plugins/cpptools/headerpathfilter.cpp
@@ -134,8 +134,6 @@ void removeClangSystemHeaderPaths(HeaderPaths &headerPaths) @@ -157,7 +157,6 @@ void removeClangSystemHeaderPaths(HeaderPaths &headerPaths)
void HeaderPathFilter::tweakHeaderPaths() void HeaderPathFilter::tweakHeaderPaths()
{ {
- removeClangSystemHeaderPaths(builtInHeaderPaths); - removeClangSystemHeaderPaths(builtInHeaderPaths);
- removeGccInternalIncludePaths();
auto split = resourceIterator(builtInHeaderPaths,
projectPart.toolChainTargetTriple.contains("darwin"));
auto split = resourceIterator(builtInHeaderPaths);

4
pkgs/development/tools/qtcreator/default.nix
View File

@ -20,12 +20,12 @@ in
mkDerivation rec { mkDerivation rec {
pname = "qtcreator"; pname = "qtcreator";
version = "4.10.0"; version = "4.11.0";
baseVersion = builtins.concatStringsSep "." (lib.take 2 (builtins.splitVersion version)); baseVersion = builtins.concatStringsSep "." (lib.take 2 (builtins.splitVersion version));
src = fetchurl { src = fetchurl {
url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz";
sha256 = "12hgxdghz05ms4zl8prz2w8l66vmgw1qw2gsmmwqi2rdaay3lpcg"; sha256 = "0ibn7bapw7m26nmxl26dns1hnpawfdqk1i1mgg0gjssja8famszg";
}; };
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++ buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++