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>

9 files changed, 75 insertions, 18 deletions

diff --git a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
index 36bce98d..1e0a1e42 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-configuration.qdoc
@@ -63,6 +63,53 @@
 
     \include qquickuniversalstyle.qdocinc conf
 
+    The default \l {Control::font}{font} can be specified in a \c Font sub-group
+    in each style's section in the configuration file. The \c Font sub-group can
+    be defined in two alternative ways:
+
+    \code
+    [Default]
+    Font\Family=Open Sans
+    Font\PixelSize=20
+
+    [Material\Font]
+    Family=Open Sans
+    PixelSize=20
+    \endcode
+
+    Supported font attributes:
+    \table
+        \header
+            \li Variable
+            \li Description
+        \row
+            \li \c Family
+            \li The \l {QFont::family}{font family}.
+        \row
+            \li \c PointSize
+            \li The \l {QFont::pointSizeF}{point size}.
+        \row
+            \li \c PixelSize
+            \li The \l {QFont::pixelSize}{pixel size}.
+        \row
+            \li \c StyleHint
+            \li The \l {QFont::styleHint}{style hint}.
+                Available values: \c SansSerif, \c Helvetica, \c Serif, \c Times, \c TypeWriter, \c Courier,
+                                  \c OldEnglish, \c Decorative, \c Monospace, \c Fantasy, \c Cursive.
+        \row
+            \li \c Weight
+            \li The \l {QFont::}{weight}. Qt uses a weighting scale from \c 0 to \c 99 similar to,
+                but not the same as, the scales used in Windows or CSS. A weight of \c 0 will be thin,
+                whilst \c 99 will be extremely black.
+                Available pre-defined weights: \c Thin (0), \c ExtraLight (12), \c Light (25), \c Normal (50),
+                                               \c Medium (57), \c DemiBold (63), \c Bold (75), \c ExtraBold (81),
+                                               \c Black (87).
+        \row
+            \li \c Style
+            \li The \l {QFont::}{style}.
+                Available values: \c StyleNormal, \c StyleItalic, \c StyleOblique.
+    \endtable
+
     In order to make it possible for Qt Quick Controls 2 to find the configuration file,
     it must be built into application's resources using the \l {The Qt Resource System}.
     Here's an example \c .qrc file:
diff --git a/src/imports/controls/fusion/qquickfusiontheme.cpp b/src/imports/controls/fusion/qquickfusiontheme.cpp
index 54536101..1c5025a4 100644
--- a/src/imports/controls/fusion/qquickfusiontheme.cpp
+++ b/src/imports/controls/fusion/qquickfusiontheme.cpp
@@ -38,8 +38,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QQuickFusionTheme::QQuickFusionTheme(QPlatformTheme *theme)
-    : QQuickProxyTheme(theme)
+QQuickFusionTheme::QQuickFusionTheme()
+    : QQuickTheme(QStringLiteral("Fusion"))
 {
 }
 
diff --git a/src/imports/controls/fusion/qquickfusiontheme_p.h b/src/imports/controls/fusion/qquickfusiontheme_p.h
index c5949848..19cb8617 100644
--- a/src/imports/controls/fusion/qquickfusiontheme_p.h
+++ b/src/imports/controls/fusion/qquickfusiontheme_p.h
@@ -50,14 +50,14 @@
 
 #include <QtCore/qvariant.h>
 #include <QtGui/qpalette.h>
-#include <QtQuickControls2/private/qquickproxytheme_p.h>
+#include <QtQuickControls2/private/qquicktheme_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickFusionTheme :  public QQuickProxyTheme
+class QQuickFusionTheme :  public QQuickTheme
 {
 public:
-    explicit QQuickFusionTheme(QPlatformTheme *theme = nullptr);
+    explicit QQuickFusionTheme();
 
     const QPalette *palette(Palette type = SystemPalette) const override;
 };
diff --git a/src/imports/controls/material/qquickmaterialtheme.cpp b/src/imports/controls/material/qquickmaterialtheme.cpp
index f75fa8a5..7ef2f0e7 100644
--- a/src/imports/controls/material/qquickmaterialtheme.cpp
+++ b/src/imports/controls/material/qquickmaterialtheme.cpp
@@ -42,8 +42,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme)
-    : QQuickProxyTheme(theme)
+QQuickMaterialTheme::QQuickMaterialTheme()
+    : QQuickTheme(QStringLiteral("Material"))
 {
     QFont font;
     font.setFamily(QLatin1String("Roboto"));
@@ -65,22 +65,29 @@ QQuickMaterialTheme::QQuickMaterialTheme(QPlatformTheme *theme)
     }
 
     systemFont.setPixelSize(14);
+    systemFont = resolveFont(systemFont);
 
     buttonFont.setPixelSize(14);
     buttonFont.setCapitalization(QFont::AllUppercase);
     buttonFont.setWeight(QFont::Medium);
+    buttonFont = resolveFont(buttonFont);
 
     toolTipFont.setPixelSize(14);
     toolTipFont.setWeight(QFont::Medium);
+    toolTipFont = resolveFont(toolTipFont);
 
     itemViewFont.setPixelSize(14);
     itemViewFont.setWeight(QFont::Medium);
+    itemViewFont = resolveFont(itemViewFont);
 
     listViewFont.setPixelSize(16);
+    listViewFont = resolveFont(listViewFont);
 
     menuItemFont.setPixelSize(16);
+    menuItemFont = resolveFont(menuItemFont);
 
     editorFont.setPixelSize(16);
+    editorFont = resolveFont(editorFont);
 }
 
 const QFont *QQuickMaterialTheme::font(QPlatformTheme::Font type) const
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;
 
diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp
index 69bc49c5..f9cdcddc 100644
--- a/src/imports/controls/qquickdefaulttheme.cpp
+++ b/src/imports/controls/qquickdefaulttheme.cpp
@@ -39,7 +39,7 @@
 QT_BEGIN_NAMESPACE
 
 QQuickDefaultTheme::QQuickDefaultTheme()
-    : QQuickProxyTheme()
+    : QQuickTheme(QStringLiteral("Default"))
 {
 }
 
diff --git a/src/imports/controls/qquickdefaulttheme_p.h b/src/imports/controls/qquickdefaulttheme_p.h
index f3337dd9..e0811dcb 100644
--- a/src/imports/controls/qquickdefaulttheme_p.h
+++ b/src/imports/controls/qquickdefaulttheme_p.h
@@ -48,11 +48,11 @@
 // We mean it.
 //
 
-#include <QtQuickControls2/private/qquickproxytheme_p.h>
+#include <QtQuickControls2/private/qquicktheme_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickDefaultTheme : public QQuickProxyTheme
+class QQuickDefaultTheme : public QQuickTheme
 {
 public:
     explicit QQuickDefaultTheme();
diff --git a/src/imports/controls/universal/qquickuniversaltheme.cpp b/src/imports/controls/universal/qquickuniversaltheme.cpp
index a7bcbb8c..549840b6 100644
--- a/src/imports/controls/universal/qquickuniversaltheme.cpp
+++ b/src/imports/controls/universal/qquickuniversaltheme.cpp
@@ -41,8 +41,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QQuickUniversalTheme::QQuickUniversalTheme(QPlatformTheme *theme)
-    : QQuickProxyTheme(theme)
+QQuickUniversalTheme::QQuickUniversalTheme()
+    : QQuickTheme(QStringLiteral("Universal"))
 {
     const QFont font(QLatin1String("Segoe UI"));
     if (QFontInfo(font).family() == QLatin1String("Segoe UI")) {
@@ -53,12 +53,15 @@ QQuickUniversalTheme::QQuickUniversalTheme(QPlatformTheme *theme)
     }
 
     systemFont.setPixelSize(15);
+    systemFont = resolveFont(systemFont);
 
     groupBoxTitleFont.setPixelSize(15);
     groupBoxTitleFont.setWeight(QFont::DemiBold);
+    groupBoxTitleFont = resolveFont(groupBoxTitleFont);
 
     tabButtonFont.setPixelSize(24);
     tabButtonFont.setWeight(QFont::Light);
+    tabButtonFont = resolveFont(tabButtonFont);
 }
 
 const QFont *QQuickUniversalTheme::font(QPlatformTheme::Font type) const
diff --git a/src/imports/controls/universal/qquickuniversaltheme_p.h b/src/imports/controls/universal/qquickuniversaltheme_p.h
index 7e18a483..f15dee3e 100644
--- a/src/imports/controls/universal/qquickuniversaltheme_p.h
+++ b/src/imports/controls/universal/qquickuniversaltheme_p.h
@@ -49,14 +49,14 @@
 //
 
 #include <QtGui/qfont.h>
-#include <QtQuickControls2/private/qquickproxytheme_p.h>
+#include <QtQuickControls2/private/qquicktheme_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickUniversalTheme : public QQuickProxyTheme
+class QQuickUniversalTheme : public QQuickTheme
 {
 public:
-    explicit QQuickUniversalTheme(QPlatformTheme *theme = nullptr);
+    explicit QQuickUniversalTheme();
 
     const QFont *font(Font type = SystemFont) const override;