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, 16 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_scrollindicator.qml b/tests/auto/controls/data/tst_scrollindicator.qml
index 551247f6..1ec03b15 100644
--- a/tests/auto/controls/data/tst_scrollindicator.qml
+++ b/tests/auto/controls/data/tst_scrollindicator.qml
@@ -150,6 +150,22 @@ TestCase {
         compare(horizontal.size, container.visibleArea.widthRatio)
         compare(horizontal.position, container.visibleArea.xPosition)
 
+        var oldY = vertical.y
+        var oldHeight = vertical.height
+        vertical.parent = testCase
+        vertical.y -= 10
+        container.height += 10
+        compare(vertical.y, oldY - 10)
+        compare(vertical.height, oldHeight)
+
+        var oldX = horizontal.x
+        var oldWidth = horizontal.width
+        horizontal.parent = testCase
+        horizontal.x -= 10
+        container.width += 10
+        compare(horizontal.x, oldX - 10)
+        compare(horizontal.width, oldWidth)
+
         container.destroy()
     }