mirror of
git://slackware.nl/current.git
synced 2025-01-28 08:02:25 +01:00
7cde3ca9e7
a/kernel-generic-5.4.20-x86_64-1.txz: Upgraded. a/kernel-huge-5.4.20-x86_64-1.txz: Upgraded. a/kernel-modules-5.4.20-x86_64-1.txz: Upgraded. a/shadow-4.8.1-x86_64-3.txz: Rebuilt. a/util-linux-2.35.1-x86_64-3.txz: Rebuilt. d/kernel-headers-5.4.20-x86-1.txz: Upgraded. k/kernel-source-5.4.20-noarch-1.txz: Upgraded. l/ConsoleKit2-1.2.1-x86_64-2.txz: Rebuilt. l/dconf-editor-3.34.4-x86_64-1.txz: Upgraded. l/libxkbcommon-0.10.0-x86_64-1.txz: Added. l/openal-soft-1.19.1-x86_64-1.txz: Added. l/qt5-5.13.2-x86_64-1.txz: Added. Thanks to alienBOB. n/openssh-8.2p1-x86_64-1.txz: Upgraded. Potentially incompatible changes: * ssh(1), sshd(8): the removal of "ssh-rsa" from the accepted CASignatureAlgorithms list. * ssh(1), sshd(8): this release removes diffie-hellman-group14-sha1 from the default key exchange proposal for both the client and server. * ssh-keygen(1): the command-line options related to the generation and screening of safe prime numbers used by the diffie-hellman-group-exchange-* key exchange algorithms have changed. Most options have been folded under the -O flag. * sshd(8): the sshd listener process title visible to ps(1) has changed to include information about the number of connections that are currently attempting authentication and the limits configured by MaxStartups. x/mesa-19.3.4-x86_64-2.txz: Rebuilt. Reverted "[PATCH] swr: Fix GCC 4.9 checks." which makes X fail to start with an illegal instruction on some hardware. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. testing/packages/PAM/ConsoleKit2-1.2.1-x86_64-2_pam.txz: Rebuilt. Rebuilt with --disable-libcgmanager to fix setting limits on PAM. Thanks to gattocarlo. testing/packages/PAM/openssh-8.2p1-x86_64-1_pam.txz: Upgraded. testing/packages/PAM/shadow-4.8.1-x86_64-3_pam.txz: Rebuilt. Moved some of the /etc/pam.d/ file to the util-linux package where they more properly belong. testing/packages/PAM/util-linux-2.35.1-x86_64-3_pam.txz: Rebuilt. Added some /etc/pam.d/ files previously in the shadow package. Changed /etc/pam.d/{chfn,chsh} and made chfn/chsh setuid root to fix them. Added /etc/pam.d/{runuser,runuser-l}. usb-and-pxe-installers/usbboot.img: Rebuilt.
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
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
|
|
|