QQuickAbstractButton: fix the order of nextCheckState() vs. clicked()

Task-number: QTBUG-52448
Change-Id: I4ee2c16f3dccc61e07268f9e8ced530a06d2adf3
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

2 files changed, 32 insertions, 32 deletions

diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index 7e0c88e4..6b3718e2 100644
--- a/tests/auto/controls/data/tst_checkbox.qml
+++ b/tests/auto/controls/data/tst_checkbox.qml
@@ -139,10 +139,10 @@ TestCase {
         verify(control.spy.success)
 
         control.spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
-                                        "released",
-                                        "clicked",
                                         ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
-                                        ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }]]
+                                        ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
+                                        "released",
+                                        "clicked"]
         mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(control.checked, true)
         compare(control.checkState, Qt.Checked)
@@ -156,10 +156,10 @@ TestCase {
         compare(control.pressed, true)
         verify(control.spy.success)
         control.spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
-                                        "released",
-                                        "clicked",
                                         ["checkStateChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
-                                        ["checkedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }]]
+                                        ["checkedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
+                                        "released",
+                                        "clicked"]
         mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(control.checked, false)
         compare(control.checkState, Qt.Unchecked)
@@ -209,10 +209,10 @@ TestCase {
         control.spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false, "checkState": Qt.Unchecked }],
                                         "pressed",
                                         ["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
-                                        "released",
-                                        "clicked",
                                         ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
-                                        ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }]]
+                                        ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
+                                        "released",
+                                        "clicked"]
         keyClick(Qt.Key_Space)
         compare(control.checked, true)
         compare(control.checkState, Qt.Checked)
@@ -222,10 +222,10 @@ TestCase {
         control.spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true, "checkState": Qt.Checked }],
                                         "pressed",
                                         ["pressedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
-                                        "released",
-                                        "clicked",
                                         ["checkStateChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
-                                        ["checkedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }]]
+                                        ["checkedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
+                                        "released",
+                                        "clicked"]
         keyClick(Qt.Key_Space)
         compare(control.checked, false)
         compare(control.checkState, Qt.Unchecked)
@@ -343,9 +343,9 @@ TestCase {
         control.spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true, "checkState": Qt.PartiallyChecked }],
                                         "pressed",
                                         ["pressedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }],
+                                        ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
                                         "released",
-                                        "clicked",
-                                        ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }]]
+                                        "clicked"]
         keyClick(Qt.Key_Space)
         compare(control.checked, true)
         compare(control.checkState, Qt.Checked)
@@ -355,10 +355,10 @@ TestCase {
         control.spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true, "checkState": Qt.Checked }],
                                         "pressed",
                                         ["pressedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
-                                        "released",
-                                        "clicked",
                                         ["checkStateChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
-                                        ["checkedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }]]
+                                        ["checkedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
+                                        "released",
+                                        "clicked"]
         keyClick(Qt.Key_Space)
         compare(control.checked, false)
         compare(control.checkState, Qt.Unchecked)
@@ -368,10 +368,10 @@ TestCase {
         control.spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false, "checkState": Qt.Unchecked }],
                                         "pressed",
                                         ["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
-                                        "released",
-                                        "clicked",
                                         ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }],
-                                        ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }]]
+                                        ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }],
+                                        "released",
+                                        "clicked"]
         keyClick(Qt.Key_Space)
         compare(control.checked, true)
         compare(control.checkState, Qt.PartiallyChecked)
@@ -381,9 +381,9 @@ TestCase {
         control.spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true, "checkState": Qt.PartiallyChecked }],
                                         "pressed",
                                         ["pressedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }],
+                                        ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
                                         "released",
-                                        "clicked",
-                                        ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }]]
+                                        "clicked"]
         mouseClick(control)
         compare(control.checked, true)
         compare(control.checkState, Qt.Checked)
@@ -393,10 +393,10 @@ TestCase {
         control.spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true, "checkState": Qt.Checked }],
                                         "pressed",
                                         ["pressedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }],
-                                        "released",
-                                        "clicked",
                                         ["checkStateChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
-                                        ["checkedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }]]
+                                        ["checkedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
+                                        "released",
+                                        "clicked"]
         mouseClick(control)
         compare(control.checked, false)
         compare(control.checkState, Qt.Unchecked)
@@ -406,10 +406,10 @@ TestCase {
         control.spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false, "checkState": Qt.Unchecked }],
                                         "pressed",
                                         ["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }],
-                                        "released",
-                                        "clicked",
                                         ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }],
-                                        ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }]]
+                                        ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.PartiallyChecked }],
+                                        "released",
+                                        "clicked"]
         mouseClick(control)
         compare(control.checked, true)
         compare(control.checkState, Qt.PartiallyChecked)
diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index 1b105f08..17e3355d 100644
--- a/tests/auto/controls/data/tst_radiobutton.qml
+++ b/tests/auto/controls/data/tst_radiobutton.qml
@@ -107,9 +107,9 @@ TestCase {
         compare(control.pressed, true)
         verify(control.spy.success)
         control.spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }],
+                                        ["checkedChanged", { "pressed": false, "checked": true }],
                                         "released",
-                                        "clicked",
-                                        ["checkedChanged", { "pressed": false, "checked": true }]]
+                                        "clicked"]
         mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(control.checked, true)
         compare(control.pressed, false)
@@ -170,9 +170,9 @@ TestCase {
         control.spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false }],
                                         "pressed",
                                         ["pressedChanged", { "pressed": false, "checked": false }],
+                                        ["checkedChanged", { "pressed": false, "checked": true }],
                                         "released",
-                                        "clicked",
-                                        ["checkedChanged", { "pressed": false, "checked": true }]]
+                                        "clicked"]
         keyClick(Qt.Key_Space)
         compare(control.checked, true)
         verify(control.spy.success)