summaryrefslogtreecommitdiff
path: root/src/controls/SpinBox.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2014-07-17 22:24:18 +0200
committerJ-P Nurmi <jpnurmi@digia.com>2014-07-17 22:27:43 +0200
commitb5f2f8403fe5044dfca7dad379494a3554af3090 (patch)
tree540bd55239d17c2d471c7cc048f19202279cefe9 /src/controls/SpinBox.qml
parent267acc4587c91beafc0f8f3ea97c70801dc269f0 (diff)
downloadqtquickcontrols-b5f2f8403fe5044dfca7dad379494a3554af3090.tar.gz
SpinBox: revert back to querying font via style panel
This is a partial revert of 8c3afd8 for the same reason than 790769d. Change-Id: Ia082f375caa441a5db562b04369699092cf0007e Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/SpinBox.qml')
-rw-r--r--src/controls/SpinBox.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml
index 03a296f1..83b18a6a 100644
--- a/src/controls/SpinBox.qml
+++ b/src/controls/SpinBox.qml
@@ -281,7 +281,7 @@ Control {
onEditingFinished: spinbox.editingFinished()
- font: __style ? __style.font : TextSingleton.font
+ font: __panel ? __panel.font : TextSingleton.font
color: __panel ? __panel.foregroundColor : "black"
selectionColor: __panel ? __panel.selectionColor : "black"
selectedTextColor: __panel ? __panel.selectedTextColor : "black"