Lighthouse: using QFont enums when possible in QPlatformFontdatabase

also, make it possible to register fonts in QPlatformDatabases with a
null handle

Reviewed-by: paul

1 files changed, 4 insertions, 7 deletions

diff --git a/src/gui/text/qfontdatabase_qpa.cpp b/src/gui/text/qfontdatabase_qpa.cpp
index 19ce1be76d..e54093ce2e 100644
--- a/src/gui/text/qfontdatabase_qpa.cpp
+++ b/src/gui/text/qfontdatabase_qpa.cpp
@@ -156,14 +156,11 @@ QFontEngine *loadSingleEngine(int script,
     QFontEngine *engine = QFontCache::instance()->findEngine(key);
     if (!engine) {
         QPlatformFontDatabase *pfdb = QApplicationPrivate::platformIntegration()->fontDatabase();
-        if (size->handle) {
-            engine = pfdb->fontEngine(def,QUnicodeTables::Script(script),size->handle);
-            if (engine) {
-                QFontCache::Key key(def,script);
-                QFontCache::instance()->instance()->insertEngine(key,engine);
-            }
+        engine = pfdb->fontEngine(def,QUnicodeTables::Script(script),size->handle);
+        if (engine) {
+            QFontCache::Key key(def,script);
+            QFontCache::instance()->instance()->insertEngine(key,engine);
         }
-
     }
     return engine;
 }