Skip to content

Qt6: Use static functions in QFontDatabase #4555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Holzhaus merged 1 commit into from
Dec 6, 2021
Merged

Qt6: Use static functions in QFontDatabase #4555

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/util/font.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,22 @@ class FontUtils {
// In developer mode, spit out all the families / styles / sizes
// supported by the new font.
if (CmdlineArgs::Instance().getDeveloper()) {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QFontDatabase database;
#endif
QStringList families = QFontDatabase::applicationFontFamilies(result);
foreach (const QString& family, families) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QStringList styles = QFontDatabase::styles(family);
#else
QStringList styles = database.styles(family);
#endif
foreach (const QString& style, styles) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QList<int> pointSizes = QFontDatabase::pointSizes(family, style);
#else
QList<int> pointSizes = database.pointSizes(family, style);
#endif
QStringList pointSizesStr;
foreach (int point, pointSizes) {
pointSizesStr.append(QString::number(point));
Expand Down