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/fusion | |
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/fusion')
-rw-r--r-- | src/imports/controls/fusion/qquickfusiontheme.cpp | 4 | ||||
-rw-r--r-- | src/imports/controls/fusion/qquickfusiontheme_p.h | 6 |
2 files changed, 5 insertions, 5 deletions
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; }; |