Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4

 Conflicts:
	.qmake.conf

Change-Id: Ia33462a31303ae79f7a6ef26dc6065a0afeef3e1

1 files changed, 14 insertions, 1 deletions

diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index a27cf70e..9e2ba0f1 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -399,7 +399,7 @@ Item {
             }
         }
 
-        function test_minimumValueLargerThanValue() {
+        function test_minimumMaximumValueLargerThanValue() {
             var control = sliderComponent.createObject(container, { "style": namedHandleStyle, "minimumValue": 0, "maximumValue": 2, value: "minimumValue" });
             verify(control);
 
@@ -412,6 +412,19 @@ Item {
             compare(control.value, control.minimumValue);
             compare(handle.mapToItem(null, 0, 0).x, 0)
 
+            control.maximumValue = 5;
+            control.value = 5;
+            compare(control.value, 5);
+
+            // get the slider position at max
+            var maxPos = handle.mapToItem(null, 0, 0).x;
+
+            // reduce the maximum value, resulting in the value becoming 4 as well
+            control.maximumValue = 4;
+            compare(control.value, 4);
+            // make sure that the actual position of the handle is the same (it used to be off - see QTBUG-63354)
+            compare(handle.mapToItem(null, 0, 0).x, maxPos);
+
             control.destroy();
         }
     }