1 files changed, 13 insertions, 9 deletions
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index 9acf877790..96f3b1c1d7 100644
--- a/tests/auto/gui/text/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
@@ -58,7 +58,9 @@ private slots:
     void insertAndRemoveSubstitutions();
     void serialize_data();
     void serialize();
+#if QT_DEPRECATED_SINCE(5, 13)
     void lastResortFont();
+#endif
     void styleName();
     void defaultFamily_data();
     void defaultFamily();
@@ -484,6 +486,7 @@ void tst_QFont::serialize()
     }
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 // QFont::lastResortFont() may abort with qFatal() on QWS/QPA
 // if absolutely no font is found. Just as ducumented for QFont::lastResortFont().
 // This happens on our CI machines which run QWS autotests.
@@ -494,6 +497,7 @@ void tst_QFont::lastResortFont()
     QFont font;
     QVERIFY(!font.lastResortFont().isEmpty());
 }
+#endif
 
 void tst_QFont::styleName()
 {
@@ -609,37 +613,37 @@ void tst_QFont::sharing()
     QFont f;
     f.setStyleHint(QFont::Serif);
     f.exactMatch(); // loads engine
-    QCOMPARE(QFontPrivate::get(f)->ref.load(), 1);
+    QCOMPARE(QFontPrivate::get(f)->ref.loadRelaxed(), 1);
     QVERIFY(QFontPrivate::get(f)->engineData);
-    QCOMPARE(QFontPrivate::get(f)->engineData->ref.load(), 1 + refs_by_cache);
+    QCOMPARE(QFontPrivate::get(f)->engineData->ref.loadRelaxed(), 1 + refs_by_cache);
 
     QFont f2(f);
     QCOMPARE(QFontPrivate::get(f2), QFontPrivate::get(f));
-    QCOMPARE(QFontPrivate::get(f2)->ref.load(), 2);
+    QCOMPARE(QFontPrivate::get(f2)->ref.loadRelaxed(), 2);
     QVERIFY(QFontPrivate::get(f2)->engineData);
     QCOMPARE(QFontPrivate::get(f2)->engineData, QFontPrivate::get(f)->engineData);
-    QCOMPARE(QFontPrivate::get(f2)->engineData->ref.load(), 1 + refs_by_cache);
+    QCOMPARE(QFontPrivate::get(f2)->engineData->ref.loadRelaxed(), 1 + refs_by_cache);
 
     f2.setKerning(!f.kerning());
     QVERIFY(QFontPrivate::get(f2) != QFontPrivate::get(f));
-    QCOMPARE(QFontPrivate::get(f2)->ref.load(), 1);
+    QCOMPARE(QFontPrivate::get(f2)->ref.loadRelaxed(), 1);
     QVERIFY(QFontPrivate::get(f2)->engineData);
     QCOMPARE(QFontPrivate::get(f2)->engineData, QFontPrivate::get(f)->engineData);
-    QCOMPARE(QFontPrivate::get(f2)->engineData->ref.load(), 2 + refs_by_cache);
+    QCOMPARE(QFontPrivate::get(f2)->engineData->ref.loadRelaxed(), 2 + refs_by_cache);
 
     f2 = f;
     QCOMPARE(QFontPrivate::get(f2), QFontPrivate::get(f));
-    QCOMPARE(QFontPrivate::get(f2)->ref.load(), 2);
+    QCOMPARE(QFontPrivate::get(f2)->ref.loadRelaxed(), 2);
     QVERIFY(QFontPrivate::get(f2)->engineData);
     QCOMPARE(QFontPrivate::get(f2)->engineData, QFontPrivate::get(f)->engineData);
-    QCOMPARE(QFontPrivate::get(f2)->engineData->ref.load(), 1 + refs_by_cache);
+    QCOMPARE(QFontPrivate::get(f2)->engineData->ref.loadRelaxed(), 1 + refs_by_cache);
 
     if (f.pointSize() > 0)
         f2.setPointSize(f.pointSize() * 2 / 3);
     else
         f2.setPixelSize(f.pixelSize() * 2 / 3);
     QVERIFY(QFontPrivate::get(f2) != QFontPrivate::get(f));
-    QCOMPARE(QFontPrivate::get(f2)->ref.load(), 1);
+    QCOMPARE(QFontPrivate::get(f2)->ref.loadRelaxed(), 1);
     QVERIFY(!QFontPrivate::get(f2)->engineData);
     QVERIFY(QFontPrivate::get(f2)->engineData != QFontPrivate::get(f)->engineData);
 }