Skip to content

Commit

Permalink
qtdeclarative: revert "Patch for scrollbar regression"
Browse files Browse the repository at this point in the history
This reverts commit 5530043. The change breaks the build of
qtquickcontrols. Fixes #96159.
  • Loading branch information
peti authored and Milan committed Aug 25, 2020
1 parent c0f61f3 commit 7b52722
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
@@ -1,4 +1,4 @@
{ qtModule, lib, fetchpatch, python3, qtbase, qtsvg }:
{ qtModule, lib, python3, qtbase, qtsvg }:

with lib;

Expand All @@ -23,12 +23,4 @@ qtModule {
"bin/qmlscene"
"bin/qmltestrunner"
];
patches =
# https://mail.kde.org/pipermail/kde-distro-packagers/2020-June/000419.html
lib.optional (lib.versionAtLeast qtbase.version "5.14.2")
(fetchpatch {
url = "https://codereview.qt-project.org/gitweb?p=qt/qtdeclarative.git;a=patch;h=3e47ac319b0f53c43cc02a8356c2dec4f0daeef4";
sha256 = "0wvncg7047q73nm0svc6kb14sigwk7sc53r4778kn033aj0qqszj";
name = "qtdeclarative-QQuickItemView-fix-max-extent.patch";
});
}

0 comments on commit 7b52722

Please sign in to comment.