1 files changed, 6 insertions, 4 deletions
diff --git a/src/quickcontrols2/qquicktheme.cpp b/src/quickcontrols2/qquicktheme.cpp
index 06a66bfd..3643e975 100644
--- a/src/quickcontrols2/qquicktheme.cpp
+++ b/src/quickcontrols2/qquicktheme.cpp
@@ -134,14 +134,16 @@ QQuickTheme::QQuickTheme(const QString &style)
 
 const QFont *QQuickTheme::font(Font type) const
 {
-    Q_UNUSED(type);
-    return m_styleFont.data();
+    if (m_styleFont)
+        return m_styleFont.data();
+    return QQuickProxyTheme::font(type);
 }
 
 const QPalette *QQuickTheme::palette(Palette type) const
 {
-    Q_UNUSED(type);
-    return m_stylePalette.data();
+    if (m_stylePalette)
+        return m_stylePalette.data();
+    return QQuickProxyTheme::palette(type);
 }
 
 QFont QQuickTheme::resolveFont(const QFont &font) const