diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-09 15:40:45 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-31 09:07:01 +0000 |
| commit | f2264e2684ebc5ff775515e6fcc358c68298ef3e (patch) | |
| tree | 1e476570219c4fef7e3c6e1c15759ae7b4fc7d66 /src/imports/controls/qquickdefaulttheme_p.h | |
| parent | 7d592bcbfb604b1179004e311aa6a972fab6707c (diff) | |
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>
Diffstat (limited to 'src/imports/controls/qquickdefaulttheme_p.h')
| -rw-r--r-- | src/imports/controls/qquickdefaulttheme_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |