2 files changed, 27 insertions, 4 deletions

diff --git a/tests/auto/controls/data/rangemodel/init.qml b/tests/auto/controls/data/rangemodel/init.qml
index 9d050143..12395276 100644
--- a/tests/auto/controls/data/rangemodel/init.qml
+++ b/tests/auto/controls/data/rangemodel/init.qml
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
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();
         }
     }