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

Conflicts:
	src/imports/controls/ScrollBar.qml
	src/imports/controls/material/ScrollBar.qml
	src/imports/controls/universal/ScrollBar.qml
	src/templates/qquickscrollbar.cpp
	tests/auto/controls/data/tst_scrollbar.qml

Change-Id: I646882e0563f72df682bac49f96875a08b1b0de9

2 files changed, 44 insertions, 1 deletions

diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index b2782b44..d51f16fb 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -769,4 +769,29 @@ TestCase {
 
         control.destroy()
     }
+
+    Component {
+        id: asyncLoader
+        Loader {
+            active: false
+            asynchronous: true
+            sourceComponent: ComboBox {
+                model: ["First", "Second", "Third"]
+            }
+        }
+    }
+
+    // QTBUG-51972
+    function test_async() {
+        var loader = asyncLoader.createObject(testCase)
+        verify(loader)
+
+        loader.active = true
+        tryCompare(loader, "status", Loader.Ready)
+        verify(loader.item)
+        compare(loader.item.currentText, "First")
+        compare(loader.item.displayText, "First")
+
+        loader.destroy()
+    }
 }
diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml
index 9fa6496e..eed995bf 100644
--- a/tests/auto/controls/data/tst_scrollbar.qml
+++ b/tests/auto/controls/data/tst_scrollbar.qml
@@ -57,7 +57,7 @@ TestCase {
 
     Component {
         id: scrollBar
-        ScrollBar { }
+        ScrollBar { padding: 0 }
     }
 
     Component {
@@ -248,4 +248,22 @@ TestCase {
 
         control.destroy()
     }
+
+    function test_padding_data() {
+        return [
+            { tag: "horizontal", properties: { visible: true, orientation: Qt.Horizontal, width: testCase.width, leftPadding: testCase.width * 0.1 } },
+            { tag: "vertical", properties: { visible: true, orientation: Qt.Vertical, height: testCase.height, topPadding: testCase.height * 0.1 } }
+        ]
+    }
+
+    function test_padding(data) {
+        var control = scrollBar.createObject(testCase, data.properties)
+
+        mousePress(control, control.leftPadding + control.availableWidth * 0.5, control.topPadding + control.availableHeight * 0.5, Qt.LeftButton)
+        mouseRelease(control, control.leftPadding + control.availableWidth * 0.5, control.topPadding + control.availableHeight * 0.5, Qt.LeftButton)
+
+        compare(control.position, 0.5)
+
+        control.destroy()
+    }
 }