1 files changed, 6 insertions, 44 deletions
diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
index d3267d024b..975658005e 100644
--- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
+++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.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>
 #include <private/qfontengine_p.h>
@@ -56,9 +56,6 @@ private slots:
 
     void shapingDisabledDevanagari();
     void shapingDisabledLatin();
-
-    void privateUseArea();
-
 private:
     bool haveTestFonts;
 };
@@ -1097,11 +1094,12 @@ void tst_QTextScriptEngine::combiningMarks_qtbug15675_data()
 
     bool hasTests = false;
 
-    QStringList families;
-    families << QStringLiteral("Monaco");
-    families << QStringLiteral("DejaVu Sans Mono");
+    const QString families[] = {
+        QStringLiteral("Monaco"),
+        QStringLiteral("DejaVu Sans Mono"),
+    };
 
-    foreach (const QString &family, families) {
+    for (const QString &family : families) {
         QFont font(family);
         font.setStyleStrategy(QFont::NoFontMerging);
         if (QFontInfo(font).family() != family)
@@ -1315,41 +1313,5 @@ void tst_QTextScriptEngine::shapingDisabledDevanagari()
     QCOMPARE(noShapingRuns.first().glyphIndexes().size(), normalRuns.first().glyphIndexes().size());
 }
 
-void tst_QTextScriptEngine::privateUseArea()
-{
-    QString privateUseAreaString = QString::fromUtf8("");
-
-    QFont font;
-    QList<QGlyphRun> withFontMerging;
-    {
-        QTextLayout layout;
-        layout.setText(privateUseAreaString);
-        layout.setFont(font);
-        layout.beginLayout();
-        layout.createLine();
-        layout.endLayout();
-
-        withFontMerging = layout.glyphRuns();
-    }
-
-    font.setStyleStrategy(QFont::NoFontMerging);
-    QList<QGlyphRun> withoutFontMerging;
-    {
-        QTextLayout layout;
-        layout.setText(privateUseAreaString);
-        layout.setFont(font);
-        layout.beginLayout();
-        layout.createLine();
-        layout.endLayout();
-
-        withoutFontMerging = layout.glyphRuns();
-    }
-
-    QCOMPARE(withFontMerging.size(), withoutFontMerging.size());
-
-    for (int i = 0; i < withFontMerging.size(); ++i)
-        QCOMPARE(withFontMerging.at(i).glyphIndexes(), withoutFontMerging.at(i).glyphIndexes());
-}
-
 QTEST_MAIN(tst_QTextScriptEngine)
 #include "tst_qtextscriptengine.moc"