diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-06-20 21:32:04 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-06-20 21:32:29 +0200 |
| commit | f5bee820aec44b22843299c25c5bd03e090c60bb (patch) | |
| tree | 3c486bcc3f5031565ebae626bbec613625f29bd6 /src/imports/controls/material | |
| parent | a2ab56bc3d778c7a5e30f58d0d29116ec6da793a (diff) | |
| parent | c75ca309916ae1fec31ab37f25a7ddf9ea3c150a (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/quicktemplates2/qquickcontainer.cpp
Change-Id: I7c41619a81b4fdd0d8ccaa4f0bb489a9b84e3865
Diffstat (limited to 'src/imports/controls/material')
| -rw-r--r-- | src/imports/controls/material/SpinBox.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml index bd3a2867..8be0d432 100644 --- a/src/imports/controls/material/SpinBox.qml +++ b/src/imports/controls/material/SpinBox.qml @@ -68,7 +68,7 @@ T.SpinBox { text: control.textFromValue(control.value, control.locale) font: control.font - color: control.Material.primaryTextColor + color: enabled ? control.Material.primaryTextColor : control.Material.hintTextColor selectionColor: control.Material.textSelectionColor selectedTextColor: control.Material.primaryTextColor horizontalAlignment: Qt.AlignHCenter |