diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-02 13:05:58 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-02 13:05:58 +0100 |
| commit | 5169a1ecd03eaea95ab07aeefc8d76cca7530563 (patch) | |
| tree | 2666aecdf5a9c90d9b68dd7df8c6b5d1507541a6 /src/imports/controls/SpinBox.qml | |
| parent | 7decf1ee51df6c772b84ba8bed2f1e3d0e344908 (diff) | |
| parent | 814601e9cdf5895152cedcd1968fd2a4eecd3cd3 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/Drawer.qml
src/imports/controls/Frame.qml
src/imports/controls/GroupBox.qml
src/imports/controls/Page.qml
src/imports/controls/Pane.qml
src/imports/controls/ToolBar.qml
src/imports/controls/Tumbler.qml
src/quicktemplates2/qquickapplicationwindow.cpp
src/quicktemplates2/qquickpopup.cpp
tests/auto/accessibility/data/busyindicator.qml
tests/auto/accessibility/data/button.qml
tests/auto/accessibility/data/checkbox.qml
tests/auto/accessibility/data/control.qml
tests/auto/accessibility/data/dial.qml
tests/auto/accessibility/data/label.qml
tests/auto/accessibility/data/menu.qml
tests/auto/accessibility/data/pageindicator.qml
tests/auto/accessibility/data/popup.qml
tests/auto/accessibility/data/progressbar.qml
tests/auto/accessibility/data/radiobutton.qml
tests/auto/accessibility/data/rangeslider.qml
tests/auto/accessibility/data/scrollbar.qml
tests/auto/accessibility/data/scrollindicator.qml
tests/auto/accessibility/data/slider.qml
tests/auto/accessibility/data/spinbox.qml
tests/auto/accessibility/data/switch.qml
tests/auto/accessibility/data/tabbar.qml
tests/auto/accessibility/data/tabbutton.qml
tests/auto/accessibility/data/textarea.qml
tests/auto/accessibility/data/textfield.qml
tests/auto/accessibility/data/toolbar.qml
tests/auto/accessibility/data/toolbutton.qml
tests/auto/accessibility/tst_accessibility.cpp
Change-Id: Ibc3f592162e97bef9147b35da8c9a79e73a907e6
Diffstat (limited to 'src/imports/controls/SpinBox.qml')
| -rw-r--r-- | src/imports/controls/SpinBox.qml | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml index b9e2199e..6a564d6e 100644 --- a/src/imports/controls/SpinBox.qml +++ b/src/imports/controls/SpinBox.qml @@ -56,15 +56,12 @@ T.SpinBox { leftPadding: padding + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0)) rightPadding: padding + (control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0)) - //! [validator] validator: IntValidator { locale: control.locale.name bottom: Math.min(control.from, control.to) top: Math.max(control.from, control.to) } - //! [validator] - //! [contentItem] contentItem: TextInput { z: 2 text: control.textFromValue(control.value, control.locale) @@ -92,9 +89,7 @@ T.SpinBox { border.width: 2 } } - //! [contentItem] - //! [up.indicator] up.indicator: Rectangle { x: control.mirrored ? 0 : parent.width - width height: parent.height @@ -117,9 +112,7 @@ T.SpinBox { color: enabled ? Default.textColor : Default.textDisabledColor } } - //! [up.indicator] - //! [down.indicator] down.indicator: Rectangle { x: control.mirrored ? parent.width - width : 0 height: parent.height @@ -135,12 +128,9 @@ T.SpinBox { color: enabled ? Default.textColor : Default.textDisabledColor } } - //! [down.indicator] - //! [background] background: Rectangle { implicitWidth: 140 border.color: Default.buttonColor } - //! [background] } |