QQuickControlPrivate::themeFont(): clear system font's explicit attrs

The default system font must not have explicit attributes that would
mess with font inheritance. This is already handled by the QFont()
default constructor, but we must do it ourselves when we call
QPlatformTheme::font(SystemFont) directly.

Change-Id: Ia52e135411618e72cbf4618cffb9eec7924dc612
Task-number: QTBUG-50984
Task-number: QTBUG-51696
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp
index 53955f12..49c45e24 100644
--- a/src/templates/qquickcontrol.cpp
+++ b/src/templates/qquickcontrol.cpp
@@ -251,11 +251,15 @@ QFont QQuickControlPrivate::naturalControlFont(const QQuickItem *q)
 QFont QQuickControlPrivate::themeFont(QPlatformTheme::Font type)
 {
     if (QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) {
-        if (const QFont *font = theme->font(type))
-            return *font;
+        if (const QFont *font = theme->font(type)) {
+            QFont f = *font;
+            if (type == QPlatformTheme::SystemFont)
+                f.resolve(0);
+            return f;
+        }
     }
 
-    return QGuiApplication::font();
+    return QFont();
 }
 
 /*!