diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-05-12 16:14:07 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-05-15 18:56:20 +0200 |
| commit | 2b10a192a1b892eb7d67cfb4ac5f1dd6a7f196c9 (patch) | |
| tree | 868e9ab8413cf2d0110ce24f26d988ed58ac4e73 /tests/auto/gui | |
| parent | 794150e5bda0c203a5373c3fa2f9785f9941f6dd (diff) | |
Remove deprecated method from QFont, QFontMetrics, and QFontInfo
Change-Id: Ifc8fb5c5d53359b33b8abab3bbee3de61bfef539
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'tests/auto/gui')
| -rw-r--r-- | tests/auto/gui/text/qfont/tst_qfont.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
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) |