summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2019-01-14 10:37:42 +0100
committerMårten Nordheim <marten.nordheim@qt.io>2019-01-16 14:23:37 +0000
commitf8f0f3eef1151c9377a5c76ccfa6432e930e1307 (patch)
tree08d391c978939339fc40093a0e79587f5ad589b0 /src/gui/text
parentfa2821b484dfe21de1af508bec314ff865917014 (diff)
QSyntaxHighlighter: cancel delayed highlight if done manually
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>
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qsyntaxhighlighter.cpp1
1 files changed, 1 insertions, 0 deletions
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
}
/*!