From b5154b5254950427383c96a382457fa0bb87e69e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCri=20Valdmann?= Date: Mon, 6 May 2019 11:59:31 +0200 Subject: Fix QTextEngine::shapeText casing of surrogate pairs The high part was not copied to output. Fixes: QTBUG-75559 Change-Id: I9350e52d256510f52b3fcc0015bf879d2c609532 Reviewed-by: Lars Knoll Reviewed-by: Konstantin Ritt --- src/gui/text/qtextengine.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 22c93d7ec2..2da13289bf 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1383,11 +1383,12 @@ void QTextEngine::shapeText(int item) const if (QChar::isHighSurrogate(ucs4) && i + 1 < itemLength) { uint low = string[i + 1]; if (QChar::isLowSurrogate(low)) { + // high part never changes in simple casing + uc[i] = ucs4; ++i; ucs4 = QChar::surrogateToUcs4(ucs4, low); ucs4 = si.analysis.flags == QScriptAnalysis::Lowercase ? QChar::toLower(ucs4) : QChar::toUpper(ucs4); - // high part never changes in simple casing uc[i] = QChar::lowSurrogate(ucs4); } } else { -- cgit v1.2.3