2 files changed, 82 insertions, 5 deletions

diff --git a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
index d7a22671d6..ee2f76ef76 100644
--- a/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
+++ b/tests/auto/gui/text/qfontmetrics/CMakeLists.txt
@@ -1,13 +1,20 @@
-# Generated from qfontmetrics.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## tst_qfontmetrics Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qfontmetrics LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qfontmetrics
     SOURCES
         tst_qfontmetrics.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::CorePrivate
         Qt::Gui
         Qt::GuiPrivate
@@ -17,8 +24,12 @@ qt_internal_add_test(tst_qfontmetrics
 set_source_files_properties("../../../shared/resources/testfont.ttf"
     PROPERTIES QT_RESOURCE_ALIAS "testfont.ttf"
 )
+set_source_files_properties("../../../shared/resources/testfont_linemetrics.otf"
+    PROPERTIES QT_RESOURCE_ALIAS "testfont_linemetrics.otf"
+)
 set(testfont_resource_files
     "../../../shared/resources/testfont.ttf"
+    "../../../shared/resources/testfont_linemetrics.otf"
     "ucs4font.ttf"
 )
 
diff --git a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
index 5516492365..bad33ab0a4 100644
--- a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
+++ b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
@@ -1,5 +1,5 @@
 // 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
 
 
 #include <QTest>
@@ -34,6 +34,9 @@ private slots:
     void zeroWidthMetrics();
     void verticalMetrics_data();
     void verticalMetrics();
+    void largeText_data();
+    void largeText(); // QTBUG-123339
+    void typoLineMetrics();
 };
 
 void tst_QFontMetrics::same()
@@ -261,7 +264,7 @@ void tst_QFontMetrics::inFontUcs4()
             glyphs.glyphs[0] = 0;
             QVERIFY(engine->stringToCMap(string.constData(), string.size(),
                                          &glyphs, &glyphs.numGlyphs,
-                                         QFontEngine::GlyphIndicesOnly));
+                                         QFontEngine::GlyphIndicesOnly) > 0);
             QCOMPARE(glyphs.numGlyphs, 1);
             QCOMPARE(glyphs.glyphs[0], uint(1));
         }
@@ -273,7 +276,7 @@ void tst_QFontMetrics::inFontUcs4()
             glyphs.glyphs[0] = 0;
             QVERIFY(engine->stringToCMap(string.constData(), string.size(),
                                          &glyphs, &glyphs.numGlyphs,
-                                         QFontEngine::GlyphIndicesOnly));
+                                         QFontEngine::GlyphIndicesOnly) >= 0);
             QVERIFY(glyphs.glyphs[0] != 1);
         }
     }
@@ -388,5 +391,68 @@ void tst_QFontMetrics::verticalMetrics()
     QVERIFY(fm.ascent() != 0 || fm.descent() != 0);
 }
 
+void tst_QFontMetrics::largeText_data()
+{
+    QTest::addColumn<qsizetype>("size");
+    for (int i = 1; i < 20; ++i) {
+        qsizetype size = qsizetype(1) << i;
+        QByteArray rowText = QByteArray::number(size);
+        QTest::newRow(rowText.constData()) << size;
+    }
+}
+
+void tst_QFontMetrics::largeText()
+{
+    QFont font;
+    QFontMetrics fm(font);
+    QFETCH(qsizetype, size);
+    QString string(size, QLatin1Char('A'));
+    QRect boundingRect = fm.boundingRect(string);
+    QVERIFY(boundingRect.isValid());
+}
+
+void tst_QFontMetrics::typoLineMetrics()
+{
+    QString testFont = QFINDTESTDATA("fonts/testfont_linemetrics.otf");
+    QVERIFY(!testFont.isEmpty());
+
+    int id = QFontDatabase::addApplicationFont(testFont);
+    QVERIFY(id >= 0);
+
+    {
+        auto cleanup = qScopeGuard([&id] {
+            if (id >= 0)
+                QFontDatabase::removeApplicationFont(id);
+        });
+
+        QImage img(100, 100, QImage::Format_ARGB32);
+        img.setDevicePixelRatio(1.0);
+        QFont font(QFontDatabase::applicationFontFamilies(id).at(0), &img);
+        font.setPixelSize(18);
+
+        const qreal unitsPerEm = 1000.0;
+
+        QFontMetrics defaultFm(font);
+        const int defaultAscent = defaultFm.ascent();
+        const int defaultDescent = defaultFm.descent();
+        const int defaultLeading = defaultFm.leading();
+
+        QCOMPARE(defaultAscent, qRound(1234.0 / unitsPerEm * font.pixelSize()));
+        QCOMPARE(defaultDescent, qRound(5678.0 / unitsPerEm * font.pixelSize()));
+        QCOMPARE(defaultLeading, 0.0);
+
+        font.setStyleStrategy(QFont::PreferTypoLineMetrics);
+        const QFontMetrics typoFm(font);
+
+        const int typoAscent = typoFm.ascent();
+        const int typoDescent = typoFm.descent();
+        const int typoLeading = typoFm.leading();
+
+        QCOMPARE(typoAscent, qRound(2000.0 / unitsPerEm * font.pixelSize()));
+        QCOMPARE(typoDescent, qRound(3000.0 / unitsPerEm * font.pixelSize()));
+        QCOMPARE(typoLeading, qRound(1000.0 / unitsPerEm * font.pixelSize()));
+    }
+}
+
 QTEST_MAIN(tst_QFontMetrics)
 #include "tst_qfontmetrics.moc"