diff options
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp | 26 |
2 files changed, 28 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index f8caae50e15..0b7651e65e6 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1753,7 +1753,8 @@ int QTextEngine::shapeTextWithHarfbuzzNG(const QScriptItem &si, g.offsets[0].y = QFixed{}; g.attributes[0].clusterStart = true; g.attributes[0].dontPrint = true; - log_clusters[0] = glyphs_shaped; + for (uint str_pos = 0; str_pos < item_length; ++str_pos) + log_clusters[str_pos] = glyphs_shaped; } if (Q_UNLIKELY(engineIdx != 0)) { diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp index a6f4ecaa9af..5ef35c16e09 100644 --- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp @@ -129,6 +129,7 @@ private slots: void min_maximumWidth(); void negativeLineWidth(); void embeddedImageLineHeight(); + void unmatchedShapedSubstring(); private: QFont testFont; @@ -2810,5 +2811,30 @@ void tst_QTextLayout::embeddedImageLineHeight() } } +void tst_QTextLayout::unmatchedShapedSubstring() +{ + QString s; + s += QChar(9977); + s += QChar(65039); + s += QChar(8205); + s += QChar(9794); + s += QChar(65039); + + QTextLayout lout; + + QTextOption opt; + opt.setFlags(QTextOption::DisableEmojiParsing); + lout.setTextOption(opt); + + // Note: Shaping of this string would previously assert on some platforms + lout.setText(s); + lout.beginLayout(); + lout.createLine(); + lout.endLayout(); + + QList<QGlyphRun> glyphRuns = lout.glyphRuns(); + QVERIFY(glyphRuns.size() > 0); +} + QTEST_MAIN(tst_QTextLayout) #include "tst_qtextlayout.moc" |