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

Conflicts:
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-disabled.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-normal.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-checked.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-disabled.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-focused.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-normal.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-disabled.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle-focused.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-normal.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle-focused.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-disabled.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-focused.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-normal.qml
	src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-explicit.qml
	src/quicktemplates2/qquickmenu.cpp
	tests/auto/controls/data/tst_buttongroup.qml
	tests/auto/controls/data/tst_swipedelegate.qml

Change-Id: Ib6042a0ad716f557927e7412d17ea8957d06c015

1 files changed, 9 insertions, 28 deletions

diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index 81c67681..30db246f 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -50,14 +50,9 @@ TestCase {
     when: windowShown
     name: "SpinBox"
 
-    SignalSpy{
-        id: upPressedSpy
-        signalName: "pressedChanged"
-    }
-
-    SignalSpy{
-        id: downPressedSpy
-        signalName: "pressedChanged"
+    Component {
+        id: signalSpy
+        SignalSpy { }
     }
 
     Component {
@@ -65,20 +60,6 @@ TestCase {
         SpinBox { }
     }
 
-    function init() {
-        verify(!upPressedSpy.target)
-        compare(upPressedSpy.count, 0)
-        verify(!downPressedSpy.target)
-        compare(downPressedSpy.count, 0)
-    }
-
-    function cleanup() {
-        upPressedSpy.target = null
-        upPressedSpy.clear()
-        downPressedSpy.target = null
-        downPressedSpy.clear()
-    }
-
     function test_defaults() {
         var control = spinBox.createObject(testCase)
         verify(control)
@@ -190,9 +171,12 @@ TestCase {
         var control = spinBox.createObject(testCase, {stepSize: 50})
         verify(control)
 
-        upPressedSpy.target = control.up
+        var upPressedSpy = signalSpy.createObject(control, {target: control.up, signalName: "pressedChanged"})
         verify(upPressedSpy.valid)
 
+        var downPressedSpy = signalSpy.createObject(control, {target: control.down, signalName: "pressedChanged"})
+        verify(downPressedSpy.valid)
+
         mousePress(control.up.indicator)
         compare(upPressedSpy.count, 1)
         compare(control.up.pressed, true)
@@ -225,9 +209,6 @@ TestCase {
         compare(control.down.pressed, false)
         compare(control.value, control.to)
 
-        downPressedSpy.target = control.down
-        verify(downPressedSpy.valid)
-
         control.value = 50;
         mousePress(control.down.indicator)
         compare(downPressedSpy.count, 1)
@@ -271,10 +252,10 @@ TestCase {
         var upPressedCount = 0
         var downPressedCount = 0
 
-        upPressedSpy.target = control.up
+        var upPressedSpy = signalSpy.createObject(control, {target: control.up, signalName: "pressedChanged"})
         verify(upPressedSpy.valid)
 
-        downPressedSpy.target = control.down
+        var downPressedSpy = signalSpy.createObject(control, {target: control.down, signalName: "pressedChanged"})
         verify(downPressedSpy.valid)
 
         control.forceActiveFocus()