1 files changed, 28 insertions, 7 deletions

diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index f0a32c2ed4..a474acd790 100644
--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
@@ -138,6 +138,7 @@ private slots:
     void noModificationOfInputString();
     void superscriptCrash_qtbug53911();
     void showLineAndParagraphSeparatorsCrash();
+    void koreanWordWrap();
     void tooManyDirectionalCharctersCrash_qtbug77819();
 
 private:
@@ -2228,7 +2229,6 @@ void tst_QTextLayout::superscriptCrash_qtbug53911()
         for (int j = 0; j < 4; ++j) {
             QTextLayout* newTextLayout = new QTextLayout();
             newTextLayout->setText(layoutText);
-            QList<QTextLayout::FormatRange> formatRanges;
             QTextLayout::FormatRange formatRange;
 
             formatRange.format.setFont(QFont());
@@ -2257,8 +2257,7 @@ void tst_QTextLayout::superscriptCrash_qtbug53911()
 
             formatRange.start = 0;
             formatRange.length = layoutText.size();
-            formatRanges << formatRange;
-            newTextLayout->setAdditionalFormats(formatRanges);
+            newTextLayout->setFormats({formatRange});
 
             textLayouts.push_front(newTextLayout);
         }
@@ -2289,10 +2288,7 @@ void tst_QTextLayout::nbspWithFormat()
     formatRange.length = 1;
     formatRange.format.setFontUnderline(true);
 
-    QList<QTextLayout::FormatRange> overrides;
-    overrides.append(formatRange);
-
-    layout.setAdditionalFormats(overrides);
+    layout.setFormats({formatRange});
 
     layout.beginLayout();
     forever {
@@ -2310,6 +2306,31 @@ void tst_QTextLayout::nbspWithFormat()
     QCOMPARE(layout.lineAt(1).textLength(), s2.length() + 1 + s3.length());
 }
 
+void tst_QTextLayout::koreanWordWrap()
+{
+    QString s = QString::fromUtf8("안녕하세요 여러분!");
+    QTextLayout layout;
+    QTextOption option = layout.textOption();
+    option.setWrapMode(QTextOption::WordWrap);
+    option.setFlags(QTextOption::Flag(QTextOption::IncludeTrailingSpaces));
+    layout.setTextOption(option);
+    layout.setText(s);
+
+    QFontMetrics metrics(layout.font());
+
+    layout.beginLayout();
+    forever {
+        QTextLine line = layout.createLine();
+        if (!line.isValid())
+            break;
+        line.setLineWidth(metrics.horizontalAdvance(s) * 0.8);
+    }
+    layout.endLayout();
+    QCOMPARE(layout.lineCount(), 2);
+    QCOMPARE(layout.lineAt(0).textLength(), 6);
+    QCOMPARE(layout.lineAt(1).textLength(), 4);
+}
+
 void tst_QTextLayout::tooManyDirectionalCharctersCrash_qtbug77819()
 {
     QString data;