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, 18 insertions, 55 deletions

diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml
index c2a4bb2b..c81c6341 100644
--- a/tests/auto/controls/data/tst_popup.qml
+++ b/tests/auto/controls/data/tst_popup.qml
@@ -72,65 +72,28 @@ TestCase {
         Rectangle { }
     }
 
-    SignalSpy {
-        id: availableWidthSpy
-        signalName: "availableWidthChanged"
-    }
-
-    SignalSpy {
-        id: availableHeightSpy
-        signalName: "availableHeightChanged"
-    }
-
-    SignalSpy {
-        id: paddingSpy
-        signalName: "paddingChanged"
-    }
-
-    SignalSpy {
-        id: topPaddingSpy
-        signalName: "topPaddingChanged"
-    }
-
-    SignalSpy {
-        id: leftPaddingSpy
-        signalName: "leftPaddingChanged"
-    }
-
-    SignalSpy {
-        id: rightPaddingSpy
-        signalName: "rightPaddingChanged"
-    }
-
-    SignalSpy {
-        id: bottomPaddingSpy
-        signalName: "bottomPaddingChanged"
-    }
-
-    SignalSpy {
-        id: xSpy
-        signalName: "xChanged"
-    }
-
-    SignalSpy {
-        id: ySpy
-        signalName: "yChanged"
+    Component {
+        id: signalSpy
+        SignalSpy { }
     }
 
     function test_padding() {
         var control = popupTemplate.createObject(testCase)
         verify(control)
 
-        paddingSpy.target = control
-        topPaddingSpy.target = control
-        leftPaddingSpy.target = control
-        rightPaddingSpy.target = control
-        bottomPaddingSpy.target = control
-
+        var paddingSpy = signalSpy.createObject(testCase, {target: control, signalName: "paddingChanged"})
         verify(paddingSpy.valid)
+
+        var topPaddingSpy = signalSpy.createObject(testCase, {target: control, signalName: "topPaddingChanged"})
         verify(topPaddingSpy.valid)
+
+        var leftPaddingSpy = signalSpy.createObject(testCase, {target: control, signalName: "leftPaddingChanged"})
         verify(leftPaddingSpy.valid)
+
+        var rightPaddingSpy = signalSpy.createObject(testCase, {target: control, signalName: "rightPaddingChanged"})
         verify(rightPaddingSpy.valid)
+
+        var bottomPaddingSpy = signalSpy.createObject(testCase, {target: control, signalName: "bottomPaddingChanged"})
         verify(bottomPaddingSpy.valid)
 
         var paddingChanges = 0
@@ -229,10 +192,10 @@ TestCase {
         var control = popupTemplate.createObject(testCase)
         verify(control)
 
-        availableWidthSpy.target = control
-        availableHeightSpy.target = control
-
+        var availableWidthSpy = signalSpy.createObject(testCase, {target: control, signalName: "availableWidthChanged"})
         verify(availableWidthSpy.valid)
+
+        var availableHeightSpy = signalSpy.createObject(testCase, {target: control, signalName: "availableHeightChanged"})
         verify(availableHeightSpy.valid)
 
         var availableWidthChanges = 0
@@ -302,10 +265,10 @@ TestCase {
         verify(control)
         verify(control.visible)
 
-        xSpy.target = control
-        ySpy.target = control
-
+        var xSpy = signalSpy.createObject(testCase, {target: control, signalName: "xChanged"})
         verify(xSpy.valid)
+
+        var ySpy = signalSpy.createObject(testCase, {target: control, signalName: "yChanged"})
         verify(ySpy.valid)
 
         // moving outside margins does not trigger change notifiers