build: fix deprecated QFontDatabase use (#481)

variar · Jun 8, 2022 · d1ecc59 · d1ecc59
1 parent e7d3020
commit d1ecc59
Showing 1 changed file with 21 additions and 8 deletions.
diff --git a/src/ui/include/fontutils.h b/src/ui/include/fontutils.h
@@ -25,34 +25,47 @@
 #include <numeric>
 
 #include <QFontDatabase>
+#include <qfontdatabase.h>
 #include <vector>
 
 class FontUtils {
   public:
     static QStringList availableFonts()
     {
-        QFontDatabase database;
-
         // We only show the fixed fonts
-        QStringList fixedFamiles;
+        QStringList fixedFamilies;
+
+#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
+        QFontDatabase database;
         auto families = database.families();
         for ( const auto& family : qAsConst( families ) ) {
             if ( database.isFixedPitch( family ) )
-                fixedFamiles << family;
+                fixedFamilies << family;
         }
+#else
+        auto families = QFontDatabase::families();
+        for ( const auto& family : qAsConst( families ) ) {
+            if ( QFontDatabase::isFixedPitch( family ) )
+                fixedFamilies << family;
+        }
+#endif
 
-        return fixedFamiles;
+        return fixedFamilies;
     }
 
     static QList<int> availableFontSizes( const QString& family )
     {
-        QFontDatabase database;
-        auto sizes = database.pointSizes( family, "" );
+#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
+        auto sizes = QFontDatabase().pointSizes( family, "" );
+#else
+        auto sizes = QFontDatabase::pointSizes( family, "" );
+#endif
+
         if ( sizes.empty() ) {
             sizes = QFontDatabase::standardSizes();
         }
 
-        std::vector<int> additionalSizes(10);
+        std::vector<int> additionalSizes( 10 );
         std::iota( additionalSizes.begin(), additionalSizes.end(), 10 );
         for ( int size : additionalSizes ) {
             if ( !sizes.contains( size ) ) {