From a50f0f045d3f749a4638bd4b46078bb86b329ad8 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 2 Nov 2020 19:48:25 +0100 Subject: Get rid of all instance usage of QFontDatabase All QFontDatabase APIs are static, use them accordingly. Task-number: QTBUG-88114 Change-Id: I0e4a7508646037e6e2812611262eed8b6d7ad3de Reviewed-by: Eskil Abrahamsen Blomfeldt --- tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp') diff --git a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp index 628af91674..ad6bf900fd 100644 --- a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp +++ b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp @@ -182,7 +182,6 @@ void tst_QFontDialog::task256466_wrongStyle() if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) QSKIP("Wayland: This freezes. Figure out why."); - QFontDatabase fdb; FriendlyFontDialog dialog; dialog.setOption(QFontDialog::DontUseNativeDialog); QListView *familyList = reinterpret_cast(dialog.d_func()->familyList); @@ -193,7 +192,7 @@ void tst_QFontDialog::task256466_wrongStyle() familyList->setCurrentIndex(currentFamily); int expectedSize = sizeList->currentIndex().data().toInt(); const QFont current = dialog.currentFont(), - expected = fdb.font(currentFamily.data().toString(), + expected = QFontDatabase::font(currentFamily.data().toString(), styleList->currentIndex().data().toString(), expectedSize); QCOMPARE(current.family(), expected.family()); QCOMPARE(current.style(), expected.style()); -- cgit v1.2.3