Update Harfbuzz to 7.0.1

This is the 6.4-specific update of Harfbuzz, since Harfbuzz
was currently on an older version in 6.4 compared to other
branches.

This also backports the change to the qtextlayout test that
was done on other branches for the 6.0.0 update.

Fixes: QTBUG-111535
Change-Id: Ie8217f1541a02d3800142b88cf0007be0ed0d1e2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 13549fa7c2d27ba588471f97a640f4dbcf86b10c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 28 insertions, 13 deletions

diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index def7c88593..a8b42b8869 100644
--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
@@ -720,29 +720,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()
@@ -750,7 +750,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);
@@ -759,12 +759,27 @@ 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();
+    QVERIFY(runsToInclude <= glyphRuns.size());
 
-    layout.endLayout();
+    std::sort(glyphRuns.begin(), glyphRuns.end(),
+              [](const QGlyphRun &first, const QGlyphRun &second) {
+                    return first.positions().first().x() < second.positions().first().x();
+                 });
+
+    qreal expectedX = 0.0;
+    for (int i = 0; i < runsToInclude; ++i) {
+        expectedX += glyphRuns.at(i).boundingRect().width();
+    }
+
+    QCOMPARE(line.cursorToX(cursorPosition), expectedX);
 }
 
 void tst_QTextLayout::horizontalAlignment_data()