Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: Ia279fc4a8226626041c772902a07b2f90f37b53b

2 files changed, 19 insertions, 0 deletions

diff --git a/src/plugins/platforms/winrt/qwinrttheme.cpp b/src/plugins/platforms/winrt/qwinrttheme.cpp
index 283825a880..0e1504b1c1 100644
--- a/src/plugins/platforms/winrt/qwinrttheme.cpp
+++ b/src/plugins/platforms/winrt/qwinrttheme.cpp
@@ -44,6 +44,8 @@
 #include <QtCore/qfunctions_winrt.h>
 #include <QtGui/QPalette>
 
+#include <QtFontDatabaseSupport/private/qwinrtfontdatabase_p.h>
+
 #include <wrl.h>
 #include <windows.ui.h>
 #include <windows.ui.viewmanagement.h>
@@ -96,7 +98,13 @@ static IUISettings *uiSettings()
 class QWinRTThemePrivate
 {
 public:
+    QWinRTThemePrivate()
+        : monospaceFont(QWinRTFontDatabase::familyForStyleHint(QFont::Monospace))
+    {
+    }
+
     QPalette palette;
+    QFont monospaceFont;
 };
 
 static inline QColor fromColor(const Color &color)
@@ -321,4 +329,14 @@ const QPalette *QWinRTTheme::palette(Palette type) const
     return QPlatformTheme::palette(type);
 }
 
+const QFont *QWinRTTheme::font(QPlatformTheme::Font type) const
+{
+    Q_D(const QWinRTTheme);
+    qCDebug(lcQpaTheme) << __FUNCTION__ << type;
+    if (type == QPlatformTheme::FixedFont)
+        return &d->monospaceFont;
+
+    return QPlatformTheme::font(type);
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/winrt/qwinrttheme.h b/src/plugins/platforms/winrt/qwinrttheme.h
index cc5fc851e7..acf5a54a94 100644
--- a/src/plugins/platforms/winrt/qwinrttheme.h
+++ b/src/plugins/platforms/winrt/qwinrttheme.h
@@ -58,6 +58,7 @@ public:
     QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const override;
 
     const QPalette *palette(Palette type = SystemPalette) const override;
+    const QFont *font(Font type = SystemFont) const override;
 
     static QVariant styleHint(QPlatformIntegration::StyleHint hint);
     QVariant themeHint(ThemeHint hint) const override;