Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	tests/auto/controls/data/tst_button.qml

Change-Id: I5c97b3c1944e52dba44fd3c7d6d9a255c5e08cf7

1 files changed, 43 insertions, 37 deletions

diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index 94e3a2cb..9b6a2ae5 100644
--- a/tests/auto/controls/data/tst_radiobutton.qml
+++ b/tests/auto/controls/data/tst_radiobutton.qml
@@ -52,13 +52,13 @@ TestCase {
 
     Component {
         id: radioButton
-        RadioButton {
-            id: control
+        RadioButton { }
+    }
 
-            property SignalSequenceSpy spy: SignalSequenceSpy {
-                target: control
-                signals: ["pressed", "released", "canceled", "clicked", "pressedChanged", "checkedChanged"]
-            }
+    Component {
+        id: signalSequenceSpy
+        SignalSequenceSpy {
+            signals: ["pressed", "released", "canceled", "clicked", "pressedChanged", "checkedChanged"]
         }
     }
 
@@ -79,19 +79,21 @@ TestCase {
         var control = radioButton.createObject(testCase)
         verify(control)
 
-        control.spy.expectedSequence = [] // No change expected
+        var sequenceSpy = signalSequenceSpy.createObject(control, {target: control})
+
+        sequenceSpy.expectedSequence = [] // No change expected
         compare(control.checked, false)
-        verify(control.spy.success)
+        verify(sequenceSpy.success)
 
-        control.spy.expectedSequence = ["checkedChanged"]
+        sequenceSpy.expectedSequence = ["checkedChanged"]
         control.checked = true
         compare(control.checked, true)
-        verify(control.spy.success)
+        verify(sequenceSpy.success)
 
-        control.spy.reset()
+        sequenceSpy.reset()
         control.checked = false
         compare(control.checked, false)
-        verify(control.spy.success)
+        verify(sequenceSpy.success)
 
         control.destroy()
     }
@@ -100,59 +102,61 @@ TestCase {
         var control = radioButton.createObject(testCase)
         verify(control)
 
+        var sequenceSpy = signalSequenceSpy.createObject(control, {target: control})
+
         // check
-        control.spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false }],
+        sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false }],
                                         "pressed"]
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(control.pressed, true)
-        verify(control.spy.success)
-        control.spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }],
+        verify(sequenceSpy.success)
+        sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }],
                                         ["checkedChanged", { "pressed": false, "checked": true }],
                                         "released",
                                         "clicked"]
         mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(control.checked, true)
         compare(control.pressed, false)
-        verify(control.spy.success)
+        verify(sequenceSpy.success)
 
         // attempt uncheck
-        control.spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true }],
+        sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true }],
                                         "pressed"]
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(control.pressed, true)
-        verify(control.spy.success)
-        control.spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }],
+        verify(sequenceSpy.success)
+        sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }],
                                         "released",
                                         "clicked"]
         mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(control.checked, true)
         compare(control.pressed, false)
-        verify(control.spy.success)
+        verify(sequenceSpy.success)
 
         // release outside
-        control.spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true }],
+        sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true }],
                                         "pressed"]
         mousePress(control, control.width / 2, control.height / 2, Qt.LeftButton)
         compare(control.pressed, true)
-        verify(control.spy.success)
-        control.spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }]]
+        verify(sequenceSpy.success)
+        sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }]]
         mouseMove(control, control.width * 2, control.height * 2, 0, Qt.LeftButton)
         compare(control.pressed, false)
-        control.spy.expectedSequence = [["canceled", { "pressed": false, "checked": true }]]
+        sequenceSpy.expectedSequence = [["canceled", { "pressed": false, "checked": true }]]
         mouseRelease(control, control.width * 2, control.height * 2, Qt.LeftButton)
         compare(control.checked, true)
         compare(control.pressed, false)
-        verify(control.spy.success)
+        verify(sequenceSpy.success)
 
         // right button
-        control.spy.expectedSequence = []
+        sequenceSpy.expectedSequence = []
         mousePress(control, control.width / 2, control.height / 2, Qt.RightButton)
         compare(control.pressed, false)
-        verify(control.spy.success)
+        verify(sequenceSpy.success)
         mouseRelease(control, control.width / 2, control.height / 2, Qt.RightButton)
         compare(control.checked, true)
         compare(control.pressed, false)
-        verify(control.spy.success)
+        verify(sequenceSpy.success)
 
         control.destroy()
     }
@@ -161,13 +165,15 @@ TestCase {
         var control = radioButton.createObject(testCase)
         verify(control)
 
-        control.spy.expectedSequence = []
+        var sequenceSpy = signalSequenceSpy.createObject(control, {target: control})
+
+        sequenceSpy.expectedSequence = []
         control.forceActiveFocus()
         verify(control.activeFocus)
-        verify(control.spy.success)
+        verify(sequenceSpy.success)
 
         // check
-        control.spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false }],
+        sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": false }],
                                         "pressed",
                                         ["pressedChanged", { "pressed": false, "checked": false }],
                                         ["checkedChanged", { "pressed": false, "checked": true }],
@@ -175,26 +181,26 @@ TestCase {
                                         "clicked"]
         keyClick(Qt.Key_Space)
         compare(control.checked, true)
-        verify(control.spy.success)
+        verify(sequenceSpy.success)
 
         // attempt uncheck
-        control.spy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true }],
+        sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": true, "checked": true }],
                                         "pressed",
                                         ["pressedChanged", { "pressed": false, "checked": true }],
                                         "released",
                                         "clicked"]
         keyClick(Qt.Key_Space)
         compare(control.checked, true)
-        verify(control.spy.success)
+        verify(sequenceSpy.success)
 
         // no change
-        control.spy.expectedSequence = []
+        sequenceSpy.expectedSequence = []
         var keys = [Qt.Key_Enter, Qt.Key_Return, Qt.Key_Escape, Qt.Key_Tab]
         for (var i = 0; i < keys.length; ++i) {
-            control.spy.reset()
+            sequenceSpy.reset()
             keyClick(keys[i])
             compare(control.checked, true)
-            verify(control.spy.success)
+            verify(sequenceSpy.success)
         }
 
         control.destroy()