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, 100 insertions, 100 deletions

diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml
index 255c1d6d..d30ade48 100644
--- a/tests/auto/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/controls/data/tst_swipedelegate.qml
@@ -54,6 +54,87 @@ TestCase {
     readonly property int dragDistance: Math.max(20, Qt.styleHints.startDragDistance + 5)
 
     Component {
+        id: backgroundFillComponent
+        SwipeDelegate {
+            background: Item { anchors.fill: parent }
+        }
+    }
+
+    Component {
+        id: backgroundCenterInComponent
+        SwipeDelegate {
+            background: Item { anchors.centerIn: parent }
+        }
+    }
+
+    Component {
+        id: backgroundLeftComponent
+        SwipeDelegate {
+            background: Item { anchors.left: parent.left }
+        }
+    }
+
+    Component {
+        id: backgroundRightComponent
+        SwipeDelegate {
+            background: Item { anchors.right: parent.right }
+        }
+    }
+
+    Component {
+        id: contentItemFillComponent
+        SwipeDelegate {
+            contentItem: Item { anchors.fill: parent }
+        }
+    }
+
+    Component {
+        id: contentItemCenterInComponent
+        SwipeDelegate {
+            contentItem: Item { anchors.centerIn: parent }
+        }
+    }
+
+    Component {
+        id: contentItemLeftComponent
+        SwipeDelegate {
+            contentItem: Item { anchors.left: parent.left }
+        }
+    }
+
+    Component {
+        id: contentItemRightComponent
+        SwipeDelegate {
+            contentItem: Item { anchors.right: parent.right }
+        }
+    }
+
+    function test_horizontalAnchors_data() {
+        return [
+            { tag: "background, fill", component: backgroundFillComponent, itemName: "background", warningLocation: ":59:25" },
+            { tag: "background, centerIn", component: backgroundCenterInComponent, itemName: "background", warningLocation: ":66:25" },
+            { tag: "background, left", component: backgroundLeftComponent, itemName: "background", warningLocation: ":73:25" },
+            { tag: "background, right", component: backgroundRightComponent, itemName: "background", warningLocation: ":80:25" },
+            { tag: "contentItem, fill", component: contentItemFillComponent, itemName: "contentItem", warningLocation: ":87:26" },
+            { tag: "contentItem, centerIn", component: contentItemCenterInComponent, itemName: "contentItem", warningLocation: ":94:26" },
+            { tag: "contentItem, left", component: contentItemLeftComponent, itemName: "contentItem", warningLocation: ":101:26" },
+            { tag: "contentItem, right", component: contentItemRightComponent, itemName: "contentItem", warningLocation: ":108:26" }
+        ];
+    }
+
+    function test_horizontalAnchors(data) {
+        var warningMessage = Qt.resolvedUrl("tst_swipedelegate.qml") + data.warningLocation
+            + ": QML : SwipeDelegate: cannot use horizontal anchors with " + data.itemName + "; unable to layout the item."
+
+        ignoreWarning(warningMessage);
+
+        var control = data.component.createObject(testCase);
+        verify(control.contentItem);
+
+        control.destroy();
+    }
+
+    Component {
         id: greenLeftComponent
 
         Rectangle {
@@ -91,18 +172,6 @@ TestCase {
         SignalSpy {}
     }
 
-    function test_defaults() {
-        var control = swipeDelegateComponent.createObject(testCase);
-        verify(control);
-
-        compare(control.baselineOffset, control.contentItem.y + control.contentItem.baselineOffset);
-        compare(control.swipe.position, 0);
-        verify(!control.pressed);
-        verify(!control.swipe.complete);
-
-        control.destroy();
-    }
-
     Component {
         id: itemComponent
 
@@ -139,7 +208,7 @@ TestCase {
         verify(control);
 
         ignoreWarning(Qt.resolvedUrl("tst_swipedelegate.qml") +
-            ":79:9: QML SwipeDelegate: cannot set both behind and left/right properties")
+            ":160:9: QML SwipeDelegate: cannot set both behind and left/right properties")
         control.swipe.behind = itemComponent;
 
         // Shouldn't be any warnings when unsetting delegates.
@@ -148,7 +217,7 @@ TestCase {
 
         // right is still set.
         ignoreWarning(Qt.resolvedUrl("tst_swipedelegate.qml") +
-            ":79:9: QML SwipeDelegate: cannot set both behind and left/right properties")
+            ":160:9: QML SwipeDelegate: cannot set both behind and left/right properties")
         control.swipe.behind = itemComponent;
 
         control.swipe.right = null;
@@ -157,11 +226,11 @@ TestCase {
         control.swipe.behind = itemComponent;
 
         ignoreWarning(Qt.resolvedUrl("tst_swipedelegate.qml") +
-            ":79:9: QML SwipeDelegate: cannot set both behind and left/right properties")
+            ":160:9: QML SwipeDelegate: cannot set both behind and left/right properties")
         control.swipe.left = itemComponent;
 
         ignoreWarning(Qt.resolvedUrl("tst_swipedelegate.qml") +
-            ":79:9: QML SwipeDelegate: cannot set both behind and left/right properties")
+            ":160:9: QML SwipeDelegate: cannot set both behind and left/right properties")
         control.swipe.right = itemComponent;
 
         control.swipe.behind = null;
@@ -176,7 +245,7 @@ TestCase {
         var oldLeft = control.swipe.left;
         var oldLeftItem = control.swipe.leftItem;
         ignoreWarning(Qt.resolvedUrl("tst_swipedelegate.qml") +
-            ":79:9: QML SwipeDelegate: left/right/behind properties may only be set when swipe.position is 0")
+            ":160:9: QML SwipeDelegate: left/right/behind properties may only be set when swipe.position is 0")
         control.swipe.left = null;
         compare(control.swipe.left, oldLeft);
         compare(control.swipe.leftItem, oldLeftItem);
@@ -187,7 +256,7 @@ TestCase {
         var oldRight = control.swipe.right;
         var oldRightItem = control.swipe.rightItem;
         ignoreWarning(Qt.resolvedUrl("tst_swipedelegate.qml") +
-            ":79:9: QML SwipeDelegate: left/right/behind properties may only be set when swipe.position is 0")
+            ":160:9: QML SwipeDelegate: left/right/behind properties may only be set when swipe.position is 0")
         control.swipe.right = null;
         compare(control.swipe.right, oldRight);
         compare(control.swipe.rightItem, oldRightItem);
@@ -213,7 +282,7 @@ TestCase {
         var oldBehind = control.swipe.behind;
         var oldBehindItem = control.swipe.behindItem;
         ignoreWarning(Qt.resolvedUrl("tst_swipedelegate.qml") +
-            ":79:9: QML SwipeDelegate: left/right/behind properties may only be set when swipe.position is 0")
+            ":160:9: QML SwipeDelegate: left/right/behind properties may only be set when swipe.position is 0")
         control.swipe.behind = null;
         compare(control.swipe.behind, oldBehind);
         compare(control.swipe.behindItem, oldBehindItem);
@@ -221,6 +290,18 @@ TestCase {
         control.destroy();
     }
 
+    function test_defaults() {
+        var control = swipeDelegateComponent.createObject(testCase);
+        verify(control);
+
+        compare(control.baselineOffset, control.contentItem.y + control.contentItem.baselineOffset);
+        compare(control.swipe.position, 0);
+        verify(!control.pressed);
+        verify(!control.swipe.complete);
+
+        control.destroy();
+    }
+
     SignalSequenceSpy {
         id: mouseSignalSequenceSpy
         signals: ["pressed", "released", "canceled", "clicked", "doubleClicked", "pressedChanged", "pressAndHold"]
@@ -1161,85 +1242,4 @@ TestCase {
 
         control.destroy();
     }
-
-    Component {
-        id: backgroundFillComponent
-        SwipeDelegate {
-            background: Item { anchors.fill: parent }
-        }
-    }
-
-    Component {
-        id: backgroundCenterInComponent
-        SwipeDelegate {
-            background: Item { anchors.centerIn: parent }
-        }
-    }
-
-    Component {
-        id: backgroundLeftComponent
-        SwipeDelegate {
-            background: Item { anchors.left: parent.left }
-        }
-    }
-
-    Component {
-        id: backgroundRightComponent
-        SwipeDelegate {
-            background: Item { anchors.right: parent.right }
-        }
-    }
-
-    Component {
-        id: contentItemFillComponent
-        SwipeDelegate {
-            contentItem: Item { anchors.fill: parent }
-        }
-    }
-
-    Component {
-        id: contentItemCenterInComponent
-        SwipeDelegate {
-            contentItem: Item { anchors.centerIn: parent }
-        }
-    }
-
-    Component {
-        id: contentItemLeftComponent
-        SwipeDelegate {
-            contentItem: Item { anchors.left: parent.left }
-        }
-    }
-
-    Component {
-        id: contentItemRightComponent
-        SwipeDelegate {
-            contentItem: Item { anchors.right: parent.right }
-        }
-    }
-
-    function test_horizontalAnchors_data() {
-        return [
-            { tag: "background, fill", component: backgroundFillComponent, itemName: "background", warningLocation: ":1168:25" },
-            { tag: "background, centerIn", component: backgroundCenterInComponent, itemName: "background", warningLocation: ":1175:25" },
-            { tag: "background, left", component: backgroundLeftComponent, itemName: "background", warningLocation: ":1182:25" },
-            { tag: "background, right", component: backgroundRightComponent, itemName: "background", warningLocation: ":1189:25" },
-            { tag: "contentItem, fill", component: contentItemFillComponent, itemName: "contentItem", warningLocation: ":1196:26" },
-            { tag: "contentItem, centerIn", component: contentItemCenterInComponent, itemName: "contentItem", warningLocation: ":1203:26" },
-            { tag: "contentItem, left", component: contentItemLeftComponent, itemName: "contentItem", warningLocation: ":1210:26" },
-            { tag: "contentItem, right", component: contentItemRightComponent, itemName: "contentItem", warningLocation: ":1217:26" }
-        ];
-    }
-
-    function test_horizontalAnchors(data) {
-        var warningMessage = Qt.resolvedUrl("tst_swipedelegate.qml") + data.warningLocation
-            + ": QML : SwipeDelegate: cannot use horizontal anchors with " + data.itemName + "; unable to layout the item."
-
-        ignoreWarning(warningMessage);
-
-        var control = data.component.createObject(testCase);
-        verify(control.contentItem);
-
-        control.destroy();
-    }
 }