diff options
author | Eric Hameleers <alien@slackware.com> | 2020-02-15 17:50:19 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2020-02-15 17:50:19 +0100 |
commit | d54fbdec265cf449cdb4910268b2d242e4f1f997 (patch) | |
tree | 2d701d0ea243ac94276620c171c98ca63b3b0e3c /deps/qt5/patches/qt5.qtbug-69310.patch | |
parent | a850a9990982e8fba1b5f008c18b9567d767e6e7 (diff) | |
download | ktown-d54fbdec265cf449cdb4910268b2d242e4f1f997.tar.gz ktown-d54fbdec265cf449cdb4910268b2d242e4f1f997.tar.xz |
Remove deps that are now part of Slackware
OpenAL got added to Slackware as 'openal-soft';
SDL_sound is now part of the Slackware 'sdl' package;
libxkbcommon and qt5 were added to Slackware in the 'L' series.
Diffstat (limited to 'deps/qt5/patches/qt5.qtbug-69310.patch')
-rw-r--r-- | deps/qt5/patches/qt5.qtbug-69310.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/deps/qt5/patches/qt5.qtbug-69310.patch b/deps/qt5/patches/qt5.qtbug-69310.patch deleted file mode 100644 index b924627..0000000 --- a/deps/qt5/patches/qt5.qtbug-69310.patch +++ /dev/null @@ -1,37 +0,0 @@ -From fcba9fa861574f33e1d2e54d8c8d6da8062927cd Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Wed, 23 Jan 2019 10:42:12 +0100 -Subject: Fix regression in QPlainTextEdit updating - -It was incorrectly counting a block having more than one line as having -changed visibility. - -Fixes: QTBUG-69310 -Change-Id: I502cda1d3e8a4efb1c14122353cc0a4731d8581c -Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> ---- - src/widgets/widgets/qplaintextedit.cpp | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp -index d6f6a364a8..57f2dec8f7 100644 ---- a/src/widgets/widgets/qplaintextedit.cpp -+++ b/src/widgets/widgets/qplaintextedit.cpp -@@ -312,10 +312,11 @@ void QPlainTextDocumentLayout::documentChanged(int from, int charsRemoved, int c - QTextBlock block = changeStartBlock; - do { - block.clearLayout(); -- const int lineCount = block.isVisible() ? 1 : 0; -- if (block.lineCount() != lineCount) { -+ if (block.isVisible() -+ ? (block.lineCount() == 0) -+ : (block.lineCount() > 0)) { - blockVisibilityChanged = true; -- block.setLineCount(lineCount); -+ block.setLineCount(block.isVisible() ? 1 : 0); - } - if (block == changeEndBlock) - break; --- -cgit v1.2.1 - |