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, 8 insertions, 28 deletions

diff --git a/tests/auto/controls/data/tst_rangeslider.qml b/tests/auto/controls/data/tst_rangeslider.qml
index 392be018..eb654bbc 100644
--- a/tests/auto/controls/data/tst_rangeslider.qml
+++ b/tests/auto/controls/data/tst_rangeslider.qml
@@ -50,14 +50,9 @@ TestCase {
     when: windowShown
     name: "RangeSlider"
 
-    SignalSpy {
-        id: firstPressedSpy
-        signalName: "pressedChanged"
-    }
-
-    SignalSpy {
-        id: secondPressedSpy
-        signalName: "pressedChanged"
+    Component {
+        id: signalSpy
+        SignalSpy { }
     }
 
     Component {
@@ -84,21 +79,6 @@ TestCase {
         }
     }
 
-    function init() {
-        verify(!firstPressedSpy.target)
-        compare(firstPressedSpy.count, 0)
-
-        verify(!secondPressedSpy.target)
-        compare(secondPressedSpy.count, 0)
-    }
-
-    function cleanup() {
-        firstPressedSpy.target = null
-        firstPressedSpy.clear()
-        secondPressedSpy.target = null
-        secondPressedSpy.clear()
-    }
-
     function test_defaults() {
         var control = sliderComponent.createObject(testCase)
         verify(control)
@@ -303,10 +283,10 @@ TestCase {
         var control = sliderComponent.createObject(testCase, { orientation: data.orientation })
         verify(control)
 
-        firstPressedSpy.target = control.first
+        var firstPressedSpy = signalSpy.createObject(control, {target: control.first, signalName: "pressedChanged"})
         verify(firstPressedSpy.valid)
 
-        secondPressedSpy.target = control.second
+        var secondPressedSpy = signalSpy.createObject(control, {target: control.second, signalName: "pressedChanged"})
         verify(secondPressedSpy.valid)
 
         mousePress(control, control.width * 0.25, control.height * 0.75, Qt.LeftButton)
@@ -473,7 +453,7 @@ TestCase {
 
         var pressedCount = 0
 
-        firstPressedSpy.target = control.first
+        var firstPressedSpy = signalSpy.createObject(control, {target: control.first, signalName: "pressedChanged"})
         verify(firstPressedSpy.valid)
 
         control.first.handle.forceActiveFocus()
@@ -511,7 +491,7 @@ TestCase {
         control.stepSize = 0.25
 
         pressedCount = 0;
-        secondPressedSpy.target = control.second
+        var secondPressedSpy = signalSpy.createObject(control, {target: control.second, signalName: "pressedChanged"})
         verify(secondPressedSpy.valid)
 
         control.second.handle.forceActiveFocus()
@@ -553,7 +533,7 @@ TestCase {
         var control = sliderComponent.createObject(testCase, { leftPadding: 10, rightPadding: 20 })
         verify(control)
 
-        firstPressedSpy.target = control.first
+        var firstPressedSpy = signalSpy.createObject(control, {target: control.first, signalName: "pressedChanged"})
         verify(firstPressedSpy.valid)
 
         mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)