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

Conflicts:
	src/imports/controls/CheckIndicator.qml
	src/imports/controls/RadioIndicator.qml
	src/imports/controls/RangeSlider.qml
	src/imports/controls/Slider.qml
	src/imports/controls/SwitchIndicator.qml

Change-Id: I32612d2f905ffa02dbaedbb1f84c8237fbd66db3

1 files changed, 31 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml
index c81c6341..982ac7ab 100644
--- a/tests/auto/controls/data/tst_popup.qml
+++ b/tests/auto/controls/data/tst_popup.qml
@@ -1229,4 +1229,35 @@ TestCase {
 
         control.destroy()
     }
+
+    Component {
+        id: xyBindingLoop
+        ApplicationWindow {
+            id: window
+            width: 360
+            height: 360
+            visible: true
+            property alias popup: popup
+
+            Popup {
+                id: popup
+                visible: true
+                x: (parent.width - width) / 2
+                y: (parent.height - height) / 2
+                Label {
+                    text: "Content"
+                    anchors.fill: parent
+                }
+            }
+        }
+    }
+
+    function test_xyBindingLoop() {
+        var window = xyBindingLoop.createObject(testCase)
+        var control = window.popup
+        waitForRendering(control.contentItem)
+        compare(control.x, (control.parent.width - control.width) / 2)
+        compare(control.y, (control.parent.height - control.height) / 2)
+        window.destroy()
+    }
 }