diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-10-26 07:58:56 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-10-26 08:23:50 +0000 |
| commit | fbcdccc4e2543555f89b9fa7236740471242df20 (patch) | |
| tree | 52fde385a88db2ae79380b804acccf79e2d7f0ce /tests/auto/controls/data/tst_checkbox.qml | |
| parent | 339ddd4fc70bbb75aec63db0429c6f5900a609f4 (diff) | |
QQuickCheckBox: don't consider partially checked as checked
[ChangeLog][Important Behavior Changes] CheckBox no longer considers
the partially checked state as a checked state. This fixes check state
cycling for a non-tri-state checkbox so that it goes from partially
checked to fully checked state.
Task-number: QTBUG-56295
Change-Id: I31f15a6a40d41fdf09888625514e06a1e966754d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/controls/data/tst_checkbox.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_checkbox.qml | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml index 55de90dc..cfce1b40 100644 --- a/tests/auto/controls/data/tst_checkbox.qml +++ b/tests/auto/controls/data/tst_checkbox.qml @@ -382,9 +382,9 @@ TestCase { compare(container.cb2.tristate, false) container.cb1.checkState = Qt.PartiallyChecked - compare(container.cb1.checked, true) + compare(container.cb1.checked, false) compare(container.cb1.checkState, Qt.PartiallyChecked) - compare(container.cb2.checked, true) + compare(container.cb2.checked, false) compare(container.cb2.checkState, Qt.PartiallyChecked) // note: since Qt Quick Controls 2.4 (Qt 5.11), CheckBox does not @@ -406,18 +406,18 @@ TestCase { compare(control.checked, false) compare(control.checkState, Qt.Unchecked) - sequenceSpy.expectedSequence = [["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }], - ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }]] + sequenceSpy.expectedSequence = [["checkStateChanged", { "pressed": false, "checked": false, "checkState": Qt.PartiallyChecked }]] control.checkState = Qt.PartiallyChecked - compare(control.checked, true) + compare(control.checked, false) compare(control.checkState, Qt.PartiallyChecked) verify(sequenceSpy.success) // key: partial -> checked - sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true, "checkState": Qt.PartiallyChecked }], + sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false, "checkState": Qt.PartiallyChecked }], "pressed", - ["pressedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }], + ["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.PartiallyChecked }], ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }], + ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }], "released", "clicked"] keyClick(Qt.Key_Space) @@ -442,20 +442,20 @@ TestCase { sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false, "checkState": Qt.Unchecked }], "pressed", ["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }], - ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }], - ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }], + ["checkStateChanged", { "pressed": false, "checked": false, "checkState": Qt.PartiallyChecked }], "released", "clicked"] keyClick(Qt.Key_Space) - compare(control.checked, true) + compare(control.checked, false) compare(control.checkState, Qt.PartiallyChecked) verify(sequenceSpy.success) // mouse: partial -> checked - sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true, "checkState": Qt.PartiallyChecked }], + sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false, "checkState": Qt.PartiallyChecked }], "pressed", - ["pressedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }], + ["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.PartiallyChecked }], ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }], + ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }], "released", "clicked"] mouseClick(control) @@ -480,12 +480,11 @@ TestCase { sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false, "checkState": Qt.Unchecked }], "pressed", ["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }], - ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }], - ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }], + ["checkStateChanged", { "pressed": false, "checked": false, "checkState": Qt.PartiallyChecked }], "released", "clicked"] mouseClick(control) - compare(control.checked, true) + compare(control.checked, false) compare(control.checkState, Qt.PartiallyChecked) verify(sequenceSpy.success) } |