diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-20 12:55:54 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-20 12:55:54 +0100 |
| commit | bc29da5c224d277dfa94ae4e188df1db325ae83a (patch) | |
| tree | 19eef227a11ab099fd04b909d326201ae7df7d8d /tests/auto/controls/data/tst_spinbox.qml | |
| parent | 5934c9670eaa6f0464c45857d72bcebf64902cc4 (diff) | |
| parent | c1b1e9a69a5770a59d0a4e59650c6487b9cd5439 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/quicktemplates2/qquickswitch.cpp
src/quicktemplates2/qquickswitchdelegate.cpp
tests/auto/controls/data/tst_dialogbuttonbox.qml
tests/auto/controls/data/tst_toolbutton.qml
Change-Id: I1da1d6de83c1d9ac854dfce1d6c9d6ba2c460404
Diffstat (limited to 'tests/auto/controls/data/tst_spinbox.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_spinbox.qml | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml index 73a122bc..ab6068eb 100644 --- a/tests/auto/controls/data/tst_spinbox.qml +++ b/tests/auto/controls/data/tst_spinbox.qml @@ -116,9 +116,21 @@ TestCase { compare(control.up.indicator.enabled, true) compare(control.down.indicator.enabled, false) + control.value = 30 + compare(control.from, 25) + compare(control.value, 30) + compare(control.up.indicator.enabled, true) + compare(control.down.indicator.enabled, true) + + control.from = 30 + compare(control.from, 30) + compare(control.value, 30) + compare(control.up.indicator.enabled, true) + compare(control.down.indicator.enabled, false) + control.to = 75 compare(control.to, 75) - compare(control.value, 25) + compare(control.value, 30) compare(control.up.indicator.enabled, true) compare(control.down.indicator.enabled, false) @@ -127,7 +139,14 @@ TestCase { compare(control.up.indicator.enabled, true) compare(control.down.indicator.enabled, true) - control.to = 40; + control.to = 50 + compare(control.to, 50) + compare(control.value, 50) + compare(control.up.indicator.enabled, false) + compare(control.down.indicator.enabled, true) + + control.to = 40 + compare(control.to, 40) compare(control.value, 40) compare(control.up.indicator.enabled, false) compare(control.down.indicator.enabled, true) |