mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +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.
72 lines
2.6 KiB
Diff
72 lines
2.6 KiB
Diff
From f8f0f3eef1151c9377a5c76ccfa6432e930e1307 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
|
|
Date: Mon, 14 Jan 2019 10:37:42 +0100
|
|
Subject: QSyntaxHighlighter: cancel delayed highlight if done manually
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
It was an implicit effect before which stopped working after
|
|
dec7961709c90f6977d2447f7fa6c6625af41cb2. Reintroduce it as some
|
|
projects used this side-effect as a way to abort the initial
|
|
highlighting.
|
|
|
|
Change-Id: I5340ee9882a242bc8b5f7f843f1cfe793a65d357
|
|
Reviewed-by: J?drzej Nowacki <jedrzej.nowacki@qt.io>
|
|
---
|
|
src/gui/text/qsyntaxhighlighter.cpp | 1 +
|
|
.../qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp | 19 +++++++++++++++++++
|
|
2 files changed, 20 insertions(+)
|
|
|
|
diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp
|
|
index b09f8b565a..0e07b69868 100644
|
|
--- a/src/gui/text/qsyntaxhighlighter.cpp
|
|
+++ b/src/gui/text/qsyntaxhighlighter.cpp
|
|
@@ -376,6 +376,7 @@ void QSyntaxHighlighter::rehighlight()
|
|
|
|
QTextCursor cursor(d->doc);
|
|
d->rehighlight(cursor, QTextCursor::End);
|
|
+ d->rehighlightPending = false; // user manually did a full rehighlight
|
|
}
|
|
|
|
/*!
|
|
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
|
|
index 9d6ce78b24..c683ecd424 100644
|
|
--- a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
|
|
+++ b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
|
|
@@ -82,6 +82,7 @@ private slots:
|
|
void preservePreeditArea();
|
|
void task108530();
|
|
void avoidUnnecessaryRehighlight();
|
|
+ void avoidUnnecessaryDelayedRehighlight();
|
|
void noContentsChangedDuringHighlight();
|
|
void rehighlight();
|
|
void rehighlightBlock();
|
|
@@ -478,6 +479,24 @@ void tst_QSyntaxHighlighter::avoidUnnecessaryRehighlight()
|
|
QTRY_VERIFY(!hl->highlighted);
|
|
}
|
|
|
|
+void tst_QSyntaxHighlighter::avoidUnnecessaryDelayedRehighlight()
|
|
+{
|
|
+ // Having text in the document before creating the highlighter starts the delayed rehighlight
|
|
+ cursor.insertText("Hello World");
|
|
+
|
|
+ TestHighlighter *hl = new TestHighlighter(doc);
|
|
+ QVERIFY(!hl->highlighted);
|
|
+
|
|
+ hl->rehighlight();
|
|
+ QVERIFY(hl->highlighted);
|
|
+
|
|
+ hl->highlighted = false;
|
|
+ // Process events, including delayed rehighlight emission
|
|
+ QCoreApplication::processEvents();
|
|
+ // Should be cancelled and no extra rehighlight should be done
|
|
+ QVERIFY(!hl->highlighted);
|
|
+}
|
|
+
|
|
void tst_QSyntaxHighlighter::noContentsChangedDuringHighlight()
|
|
{
|
|
QVector<QTextLayout::FormatRange> formats;
|
|
--
|
|
cgit v1.2.1
|
|
|