Add support for configurable fonts

A style's default font is specified in qtquickcontrols2.conf in
a "Font" group under the style's section. QSettings supports the
following two alternative syntaxes:

    [Default]
    Font\Family=Open Sans
    Font\PixelSize=20

or

    [Default\Font]
    Family=Open Sans
    PixelSize=20

[ChangeLog][Controls] Added support for specifying the default
font for different styles in qtquickcontrols2.conf.

Change-Id: I54e1efb79a2913eab35174dbf09b6956fe740e28
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/imports/controls/material/qquickmaterialtheme_p.h
index f31ab58f..0e791386 100644
--- a/src/imports/controls/material/qquickmaterialtheme_p.h
+++ b/src/imports/controls/material/qquickmaterialtheme_p.h
@@ -50,14 +50,14 @@
 
 #include <QtCore/qvariant.h>
 #include <QtGui/qfont.h>
-#include <QtQuickControls2/private/qquickproxytheme_p.h>
+#include <QtQuickControls2/private/qquicktheme_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickMaterialTheme : public QQuickProxyTheme
+class QQuickMaterialTheme : public QQuickTheme
 {
 public:
-    explicit QQuickMaterialTheme(QPlatformTheme *theme = nullptr);
+    explicit QQuickMaterialTheme();
 
     const QFont *font(Font type = SystemFont) const override;