diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-07-08 14:55:09 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-07-08 17:50:40 +0200 |
| commit | 8c3afd82b298dc2189f3e5f9edafac1b2bf6a722 (patch) | |
| tree | 5c040a80301b380a6543bfe02772bfcc0afffdf0 /src/controls/Styles/Base/SpinBoxStyle.qml | |
| parent | 818710e83c08cd97401f9858ccd29f0333488462 (diff) | |
Add SpinBoxStyle::font
Replace the hidden panel.font-property with a proper font-property
that is used in other textual controls' styles too.
Change-Id: I93d712ba48e249d28dde0bc27406a13fb6aff1b0
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'src/controls/Styles/Base/SpinBoxStyle.qml')
| -rw-r--r-- | src/controls/Styles/Base/SpinBoxStyle.qml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/controls/Styles/Base/SpinBoxStyle.qml b/src/controls/Styles/Base/SpinBoxStyle.qml index 6c76386f0..67f3b5880 100644 --- a/src/controls/Styles/Base/SpinBoxStyle.qml +++ b/src/controls/Styles/Base/SpinBoxStyle.qml @@ -110,6 +110,12 @@ Style { */ property int renderType: Text.NativeRendering + /*! + \since QtQuick.Controls.Styles 1.3 + The font of the control. + */ + property font font + /*! The button used to increment the value. */ property Component incrementControl: Item { implicitWidth: padding.right @@ -163,8 +169,6 @@ Style { implicitHeight: backgroundLoader.implicitHeight baselineOffset: backgroundLoader.item ? backgroundLoader.item.baselineOffset : 0 - property font font - property color foregroundColor: spinboxStyle.textColor property color selectionColor: spinboxStyle.selectionColor property color selectedTextColor: spinboxStyle.selectedTextColor |