diff options
author | Eric Hameleers <alien@slackware.com> | 2019-02-14 22:32:30 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-02-14 22:32:30 +0100 |
commit | a7186a15ba7c15fb7af41c729cdf2cbebd89fcfc (patch) | |
tree | e557a387cf9d6004b0b6b1a03b63c8ce930454d9 /deps/qt5/patches/qt5.qtbug-69310.patch | |
parent | 335621ea519b61e6fed5eaf82b1ccc5ebdb1afec (diff) | |
download | ktown-a7186a15ba7c15fb7af41c729cdf2cbebd89fcfc.tar.gz ktown-a7186a15ba7c15fb7af41c729cdf2cbebd89fcfc.tar.xz |
Updated deps for the next ktown release
libxkbcommon: updated to 0.8.3
qt5: updated to 5.12.1
qt5-webkit: recompiled against the new qt5
sip: updated to 4.19.14
PyQt: updated to 4.12.3 (only managed to compile on 64bit)
PyQt5: updated to 5.12
QScintilla: updated to 2.11 (dropped the Qt4 support which would not compile)
Diffstat (limited to 'deps/qt5/patches/qt5.qtbug-69310.patch')
-rw-r--r-- | deps/qt5/patches/qt5.qtbug-69310.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/deps/qt5/patches/qt5.qtbug-69310.patch b/deps/qt5/patches/qt5.qtbug-69310.patch new file mode 100644 index 0000000..b924627 --- /dev/null +++ b/deps/qt5/patches/qt5.qtbug-69310.patch @@ -0,0 +1,37 @@ +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 + |