diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-02 19:48:25 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-03 20:36:34 +0100 |
| commit | a50f0f045d3f749a4638bd4b46078bb86b329ad8 (patch) | |
| tree | 9846948577cd97029096f0b8872a4f8568e7425c /tests/auto/widgets/kernel/qapplication | |
| parent | 488e72cce841c5caeed2c27052be146baf579c3e (diff) | |
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 <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'tests/auto/widgets/kernel/qapplication')
| -rw-r--r-- | tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index 7d22a84ece..6763d3b6a6 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -367,13 +367,12 @@ void tst_QApplication::setFont_data() int argc = 0; QApplication app(argc, nullptr); // Needed for QFontDatabase - QFontDatabase fdb; - const QStringList &families = fdb.families(); + const QStringList &families = QFontDatabase::families(); for (int i = 0, count = qMin(3, families.size()); i < count; ++i) { const auto &family = families.at(i); - const QStringList &styles = fdb.styles(family); + const QStringList &styles = QFontDatabase::styles(family); if (!styles.isEmpty()) { - QList<int> sizes = fdb.pointSizes(family, styles.constFirst()); + QList<int> sizes = QFontDatabase::pointSizes(family, styles.constFirst()); if (sizes.isEmpty()) sizes = QFontDatabase::standardSizes(); if (!sizes.isEmpty()) { @@ -2515,7 +2514,6 @@ Q_GLOBAL_STATIC(QWidget, tst_qapp_widget); Q_GLOBAL_STATIC(QPixmap, tst_qapp_pixmap); Q_GLOBAL_STATIC(QFont, tst_qapp_font); Q_GLOBAL_STATIC(QRegion, tst_qapp_region); -Q_GLOBAL_STATIC(QFontDatabase, tst_qapp_fontDatabase); #ifndef QT_NO_CURSOR Q_GLOBAL_STATIC(QCursor, tst_qapp_cursor); #endif @@ -2540,7 +2538,6 @@ void tst_QApplication::globalStaticObjectDestruction() QVERIFY(tst_qapp_pixmap()); QVERIFY(tst_qapp_font()); QVERIFY(tst_qapp_region()); - QVERIFY(tst_qapp_fontDatabase()); #ifndef QT_NO_CURSOR QVERIFY(tst_qapp_cursor()); #endif |