From 2b10a192a1b892eb7d67cfb4ac5f1dd6a7f196c9 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 12 May 2020 16:14:07 +0200 Subject: Remove deprecated method from QFont, QFontMetrics, and QFontInfo Change-Id: Ifc8fb5c5d53359b33b8abab3bbee3de61bfef539 Reviewed-by: Eskil Abrahamsen Blomfeldt --- tests/auto/gui/text/qfont/tst_qfont.cpp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index 2d72eef459..0217c04788 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -58,9 +58,7 @@ 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(); @@ -501,19 +499,6 @@ 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. -// ### fixme: Check platforms -void tst_QFont::lastResortFont() -{ - QSKIP("QFont::lastResortFont() may abort with qFatal() on QPA, QTBUG-22325"); - QFont font; - QVERIFY(!font.lastResortFont().isEmpty()); -} -#endif - void tst_QFont::styleName() { #if !defined(Q_OS_MAC) -- cgit v1.2.3