Merge pull request #4555 from uklotzde/qt6-qfontdatabase

Qt6: Use static functions in QFontDatabase
mixxxdj · Dec 6, 2021 · e34ef4a · e34ef4a
2 parents 2fe7f92 + 4abca56
commit e34ef4a
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/util/font.h b/src/util/font.h
@@ -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));