1 files changed, 52 insertions, 21 deletions

diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index cf835fe245..209f5a56e2 100644
--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
@@ -1,6 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
+#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
 
 /*
     !!!!!! Warning !!!!!
@@ -728,29 +729,29 @@ void tst_QTextLayout::cursorToXForBidiBoundaries_data()
     QTest::addColumn<Qt::LayoutDirection>("textDirection");
     QTest::addColumn<QString>("text");
     QTest::addColumn<int>("cursorPosition");
-    QTest::addColumn<int>("expectedX");
+    QTest::addColumn<int>("runsToInclude");
 
     QTest::addRow("LTR, abcشزذabc, 0") << Qt::LeftToRight << "abcشزذabc"
         << 0 << 0;
     QTest::addRow("RTL, abcشزذabc, 9") << Qt::RightToLeft << "abcشزذabc"
-        << 9 << TESTFONT_SIZE * 3;
+        << 9 << 1;
     QTest::addRow("LTR, abcشزذabc, 3") << Qt::LeftToRight << "abcشزذabc"
         << 0 << 0;
     QTest::addRow("RTL, abcشزذabc, 6") << Qt::RightToLeft << "abcشزذabc"
-        << 9 << TESTFONT_SIZE * 3;
+        << 9 << 1;
 
     QTest::addRow("LTR, شزذabcشزذ, 0") << Qt::LeftToRight << "شزذabcشزذ"
-        << 0 << TESTFONT_SIZE * 2;
+        << 0 << 1;
     QTest::addRow("RTL, شزذabcشزذ, 9") << Qt::RightToLeft << "شزذabcشزذ"
         << 9 << 0;
     QTest::addRow("LTR, شزذabcشزذ, 3") << Qt::LeftToRight << "شزذabcشزذ"
-        << 3 << TESTFONT_SIZE * 2;
+        << 3 << 1;
     QTest::addRow("RTL, شزذabcشزذ, 3") << Qt::RightToLeft << "شزذabcشزذ"
-        << 3 << TESTFONT_SIZE * 5;
+        << 3 << 2;
     QTest::addRow("LTR, شزذabcشزذ, 6") << Qt::LeftToRight << "شزذabcشزذ"
-        << 6 << TESTFONT_SIZE * 5;
+        << 6 << 2;
     QTest::addRow("RTL, شزذabcشزذ, 6") << Qt::RightToLeft << "شزذabcشزذ"
-        << 6 << TESTFONT_SIZE * 2;
+        << 6 << 1;
 }
 
 void tst_QTextLayout::cursorToXForBidiBoundaries()
@@ -758,7 +759,7 @@ void tst_QTextLayout::cursorToXForBidiBoundaries()
     QFETCH(Qt::LayoutDirection, textDirection);
     QFETCH(QString, text);
     QFETCH(int, cursorPosition);
-    QFETCH(int, expectedX);
+    QFETCH(int, runsToInclude);
 
     QTextOption option;
     option.setTextDirection(textDirection);
@@ -767,12 +768,30 @@ void tst_QTextLayout::cursorToXForBidiBoundaries()
     layout.setTextOption(option);
     layout.beginLayout();
 
-    QTextLine line = layout.createLine();
-    line.setLineWidth(0x10000);
+    {
+        QTextLine line = layout.createLine();
+        line.setLineWidth(0x10000);
+    }
+    layout.endLayout();
 
-    QCOMPARE(line.cursorToX(cursorPosition), expectedX);
+    QTextLine line = layout.lineAt(0);
+    QList<QGlyphRun> glyphRuns = line.glyphRuns(-1,
+                                                -1,
+                                                QTextLayout::RetrieveStringIndexes
+                                                | QTextLayout::RetrieveGlyphIndexes);
+    QVERIFY(runsToInclude <= glyphRuns.size());
+
+    std::sort(glyphRuns.begin(), glyphRuns.end(),
+              [](const QGlyphRun &first, const QGlyphRun &second) {
+                    return first.stringIndexes().first() < second.stringIndexes().first();
+                 });
+
+    qreal expectedX = 0.0;
+    for (int i = 0; i < runsToInclude; ++i) {
+        expectedX += glyphRuns.at(i).boundingRect().width();
+    }
 
-    layout.endLayout();
+    QCOMPARE(line.cursorToX(cursorPosition), expectedX);
 }
 
 void tst_QTextLayout::horizontalAlignment_data()
@@ -2718,13 +2737,25 @@ void tst_QTextLayout::min_maximumWidth()
 
 void tst_QTextLayout::negativeLineWidth()
 {
-    QTextLayout layout;
-    layout.setText("Foo bar");
-    layout.beginLayout();
-    QTextLine line = layout.createLine();
-    line.setLineWidth(-1);
-    QVERIFY(line.textLength() > 0);
-    layout.endLayout();
+    {
+        QTextLayout layout;
+        layout.setText("Foo bar");
+        layout.beginLayout();
+        QTextLine line = layout.createLine();
+        line.setLineWidth(-1);
+        QVERIFY(line.textLength() > 0);
+        layout.endLayout();
+    }
+
+    {
+        QTextLayout layout;
+        layout.setText("Foo bar");
+        layout.beginLayout();
+        QTextLine line = layout.createLine();
+        line.setNumColumns(2, -1);
+        QVERIFY(line.textLength() > 0);
+        layout.endLayout();
+    }
 }
 
 QTEST_MAIN(tst_QTextLayout)