1 files changed, 22 insertions, 16 deletions

diff --git a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
index a998bbd482..6c6145561d 100644
--- a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
+++ b/tests/auto/gui/text/qtextformat/tst_qtextformat.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>
@@ -7,7 +7,9 @@
 
 #include <qcoreapplication.h>
 #include <qdebug.h>
+#if QT_CONFIG(settings)
 #include <qsettings.h>
+#endif
 #include <qtextformat.h>
 #include <private/qtextformat_p.h>
 #include <qtextdocument.h>
@@ -27,7 +29,9 @@ Q_OBJECT
 private slots:
     void getSetCheck();
     void defaultAlignment();
+#if QT_CONFIG(settings)
     void testQTextCharFormat() const;
+#endif
     void testUnderlinePropertyPrecedence();
     void toFormat();
     void resolveFont();
@@ -47,6 +51,7 @@ private slots:
 #endif
 };
 
+#if QT_CONFIG(settings)
 /*! \internal
   This (used to) trigger a crash in:
 
@@ -61,6 +66,7 @@ void tst_QTextFormat::testQTextCharFormat() const
 
     settings.value("test", test);
 }
+#endif
 
 // Testing get/set functions
 void tst_QTextFormat::getSetCheck()
@@ -187,7 +193,7 @@ void tst_QTextFormat::resolveFont()
     QTextCursor(&doc).insertText("Test", fmt);
 
     QList<QTextFormat> formats = doc.allFormats();
-    QCOMPARE(formats.count(), 3);
+    QCOMPARE(formats.size(), 3);
 
     QCOMPARE(formats.at(2).type(), int(QTextFormat::CharFormat));
     fmt = formats.at(2).toCharFormat();
@@ -312,8 +318,8 @@ void tst_QTextFormat::getSetTabs()
       public:
         Comparator(const QList<QTextOption::Tab> &tabs, const QList<QTextOption::Tab> &tabs2)
         {
-            QCOMPARE(tabs.count(), tabs2.count());
-            for(int i=0; i < tabs.count(); i++) {
+            QCOMPARE(tabs.size(), tabs2.size());
+            for(int i=0; i < tabs.size(); i++) {
                 QTextOption::Tab t1 = tabs[i];
                 QTextOption::Tab t2 = tabs2[i];
                 QCOMPARE(t1.position, t2.position);
@@ -364,7 +370,7 @@ void tst_QTextFormat::testTabsUsed()
     QCOMPARE(line.cursorToX(4), 100.);
 
     QTextOption option = layout->textOption();
-    QCOMPARE(option.tabs().count(), tabs.count());
+    QCOMPARE(option.tabs().size(), tabs.size());
 
 }
 
@@ -648,16 +654,16 @@ void tst_QTextFormat::clearCollection()
     charFormat2.setUnderlineStyle(QTextCharFormat::SingleUnderline);
     int formatIndex2 = collection.indexForFormat(charFormat2);
     QCOMPARE(formatIndex2, 1);
-    QCOMPARE(collection.formats.count(), 2);
-    QCOMPARE(collection.hashes.count(), 2);
+    QCOMPARE(collection.formats.size(), 2);
+    QCOMPARE(collection.hashes.size(), 2);
     QCOMPARE(collection.defaultFont(), f);
 
     collection.clear();
-    QCOMPARE(collection.formats.count(), 0);
-    QCOMPARE(collection.hashes.count(), 0);
+    QCOMPARE(collection.formats.size(), 0);
+    QCOMPARE(collection.hashes.size(), 0);
     QCOMPARE(collection.indexForFormat(charFormat2), 0);
-    QCOMPARE(collection.formats.count(), 1);
-    QCOMPARE(collection.hashes.count(), 1);
+    QCOMPARE(collection.formats.size(), 1);
+    QCOMPARE(collection.hashes.size(), 1);
     QCOMPARE(collection.defaultFont(), f); // kept, QTextDocument::clear or setPlainText should not reset the font set by setDefaultFont
 }
 
@@ -679,7 +685,7 @@ void tst_QTextFormat::dataStreamCompatibility()
         QVERIFY(properties.contains(QTextFormat::FontFamilies));
         QVERIFY(!properties.contains(QTextFormat::OldFontLetterSpacingType));
         QVERIFY(!properties.contains(QTextFormat::OldFontStretch));
-        QVERIFY(!properties.contains(QTextFormat::FontFamily));
+        QVERIFY(!properties.contains(QTextFormat::OldFontFamily));
     }
 
     QByteArray memory;
@@ -710,7 +716,7 @@ void tst_QTextFormat::dataStreamCompatibility()
                 QVERIFY(properties.contains(QTextFormat::FontFamilies));
                 QVERIFY(!properties.contains(QTextFormat::OldFontLetterSpacingType));
                 QVERIFY(!properties.contains(QTextFormat::OldFontStretch));
-                QVERIFY(!properties.contains(QTextFormat::FontFamily));
+                QVERIFY(!properties.contains(QTextFormat::OldFontFamily));
             }
         }
 
@@ -730,7 +736,7 @@ void tst_QTextFormat::dataStreamCompatibility()
             QVERIFY(properties.contains(QTextFormat::FontFamilies));
             QVERIFY(!properties.contains(QTextFormat::OldFontLetterSpacingType));
             QVERIFY(!properties.contains(QTextFormat::OldFontStretch));
-            QVERIFY(!properties.contains(QTextFormat::FontFamily));
+            QVERIFY(!properties.contains(QTextFormat::OldFontFamily));
         }
     }
 
@@ -763,7 +769,7 @@ void tst_QTextFormat::dataStreamCompatibility()
                 QVERIFY(properties.contains(QTextFormat::FontFamilies));
                 QVERIFY(!properties.contains(QTextFormat::OldFontLetterSpacingType));
                 QVERIFY(!properties.contains(QTextFormat::OldFontStretch));
-                QVERIFY(!properties.contains(QTextFormat::FontFamily));
+                QVERIFY(!properties.contains(QTextFormat::OldFontFamily));
             }
         }
 
@@ -785,7 +791,7 @@ void tst_QTextFormat::dataStreamCompatibility()
             QVERIFY(!properties.contains(QTextFormat::FontFamilies));
             QVERIFY(properties.contains(QTextFormat::OldFontLetterSpacingType));
             QVERIFY(properties.contains(QTextFormat::OldFontStretch));
-            QVERIFY(properties.contains(QTextFormat::FontFamily));
+            QVERIFY(properties.contains(QTextFormat::OldFontFamily));
         }
     }