diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-01 12:08:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-01 15:04:20 +0000 |
| commit | 209fea864e823323af3cd43456737e08168d4a9d (patch) | |
| tree | 9ee0c6e4db703579f6ced97b45a7160f4ed43c7c /src/templates/qquickcontrol_p_p.h | |
| parent | 36a40b1edfcb493f108d1efd3fd6e7f48a4a1bad (diff) | |
Added defaultFont() for QQuickControl and etc
The map between controls and QPlatformTheme::Font:
* QQuickControl and etc: SystemFont
* QQuickButton: PushButtonFont
* QQuickToolButton: ToolButtonFont
* QQuickCheckBox: CheckBoxFont
* QQuickRadioButton: RadioButtonFont
* QQuickLabel: LabelFont
* QQuickGroupBox: MdiSubWindowTitleFont (tmp)
* QQuickTabButton: DockWidgetTitleFont (tmp)
Change-Id: If8c0239ece673941164fd97f52240ef27d97b950
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickcontrol_p_p.h')
| -rw-r--r-- | src/templates/qquickcontrol_p_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/templates/qquickcontrol_p_p.h b/src/templates/qquickcontrol_p_p.h index 126eab60..ab185952 100644 --- a/src/templates/qquickcontrol_p_p.h +++ b/src/templates/qquickcontrol_p_p.h @@ -48,7 +48,10 @@ // We mean it. // +#include "qquickcontrol_p.h" + #include <QtQuick/private/qquickitem_p.h> +#include <qpa/qplatformtheme.h> #ifndef QT_NO_ACCESSIBILITY #include <QtGui/qaccessible.h> @@ -98,6 +101,7 @@ public: } void resolveFont(); static QFont naturalControlFont(const QQuickItem *); + static QFont themeFont(QPlatformTheme::Font type); QFont font; bool hasTopPadding; |