1 files changed, 32 insertions, 10 deletions
diff --git a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp
index 1569a4bf84..2f57ec47b3 100644
--- a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp
+++ b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp
@@ -605,17 +605,39 @@ void tst_QGlyphRun::multiLineBoundingRect()
 
 void tst_QGlyphRun::defaultIgnorables()
 {
-    QTextLayout layout;
-    layout.setFont(QFont("QtsSpecialTestFont"));
-    layout.setText(QChar(0x200D));
-    layout.beginLayout();
-    layout.createLine();
-    layout.endLayout();
+    {
+        QTextLayout layout;
+        layout.setFont(QFont("QtsSpecialTestFont"));
+        layout.setText(QChar(0x200D));
+        layout.beginLayout();
+        layout.createLine();
+        layout.endLayout();
+
+        QList<QGlyphRun> runs = layout.glyphRuns();
+        QCOMPARE(runs.size(), 0);
+    }
 
-    QList<QGlyphRun> runs = layout.glyphRuns();
-    QCOMPARE(runs.size(), 1);
-    QCOMPARE(runs.at(0).glyphIndexes().size(), 1);
-    QCOMPARE(runs.at(0).glyphIndexes()[0], uint(0));
+    {
+        QTextLayout layout;
+        layout.setFont(QFont("QtsSpecialTestFont"));
+        layout.setText(QStringLiteral("AAA") + QChar(0xFE0F) + QStringLiteral("111"));
+        layout.beginLayout();
+        layout.createLine();
+        layout.endLayout();
+
+        QList<QGlyphRun> runs = layout.glyphRuns();
+        QVERIFY(!runs.isEmpty());
+
+        bool hasFullMainFontRun = false;
+        for (const QGlyphRun &run : runs) {
+            if (run.rawFont().familyName() == QStringLiteral("QtsSpecialTestFont")
+                    && run.glyphIndexes().size() == 6) {
+                hasFullMainFontRun = true;
+                break;
+            }
+        }
+        QVERIFY(hasFullMainFontRun);
+    }
 }
 
 #endif // QT_NO_RAWFONT