diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-05-29 09:55:45 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-06-04 07:36:40 +0200 |
| commit | f439df7893d133261325aa19e6c8b64b41eb0042 (patch) | |
| tree | d6d12c2d928e64532757eccd9f2206cb63a52507 /src/gui | |
| parent | 915549f6ed02581242cb98c474a622288ca0fb35 (diff) | |
Set the dontPrint attribute correctly for the character being checked
This amends 36325f9d86249a4f17f7efbbc1122c462708d909 so that the
dontPrint attribute is set before incrementing i
Change-Id: I0be7386253d8607596489ce1025d2f3f8d468ab4
Pick-to: 5.15
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 3842b775f9..c6054d3114 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1525,10 +1525,10 @@ void QTextEngine::shapeText(int item) const if (QChar::isHighSurrogate(string[i]) && i + 1 < itemLength && QChar::isLowSurrogate(string[i + 1])) { + initialGlyphs.attributes[glyph_pos].dontPrint = !QChar::isPrint(QChar::surrogateToUcs4(string[i], string[i + 1])); ++i; log_clusters[i] = glyph_pos; - initialGlyphs.attributes[glyph_pos].dontPrint = !QChar::isPrint(QChar::surrogateToUcs4(string[i], string[i + 1])); } else { initialGlyphs.attributes[glyph_pos].dontPrint = !QChar::isPrint(string[i]); } |