diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-02 19:53:51 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-03 20:36:34 +0100 |
| commit | 5ea1f403502130ed12f6f6a2c6072f4f45e3d488 (patch) | |
| tree | da262f047ac6b51661fb63929f7caa4120baeef6 /src/widgets | |
| parent | a50f0f045d3f749a4638bd4b46078bb86b329ad8 (diff) | |
Deprecate QFontDatabase constructor
Move private methods into the private class.
Fixes: QTBUG-88114
Change-Id: I92fa52980ed5a0675eee310359d8875f614921e6
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/dialogs/qfontdialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp index 7dc5566b70..05ad24a287 100644 --- a/src/widgets/dialogs/qfontdialog.cpp +++ b/src/widgets/dialogs/qfontdialog.cpp @@ -46,7 +46,6 @@ #include <qcheckbox.h> #include <qcombobox.h> #include <qevent.h> -#include <qfontdatabase.h> #include <qgroupbox.h> #include <qlabel.h> #include <qlayout.h> @@ -58,6 +57,7 @@ #include <qlistview.h> #include <qstringlistmodel.h> #include <qvalidator.h> +#include <private/qfontdatabase_p.h> #include <private/qdialog_p.h> #include <private/qfont_p.h> @@ -512,12 +512,12 @@ void QFontDialogPrivate::updateFamilies() QFont f; // ##### do the right thing for a list of family names in the font. - QFontDatabase::parseFontName(family, foundryName1, familyName1); + QFontDatabasePrivate::parseFontName(family, foundryName1, familyName1); QStringList::const_iterator it = familyNames.constBegin(); int i = 0; for(; it != familyNames.constEnd(); ++it, ++i) { - QFontDatabase::parseFontName(*it, foundryName2, familyName2); + QFontDatabasePrivate::parseFontName(*it, foundryName2, familyName2); //try to match... if (familyName1 == familyName2) { |