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

7 files changed, 7 insertions, 7 deletions

diff --git a/src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png b/src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png
index d45ae400..f612c243 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png
+++ b/src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png b/src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png
index d45ae400..f612c243 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png
+++ b/src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-universal-button.png b/src/imports/controls/doc/images/qtquickcontrols-universal-button.png
index 6ddec823..6c764ec9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-universal-button.png
+++ b/src/imports/controls/doc/images/qtquickcontrols-universal-button.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols-universal-dark.png b/src/imports/controls/doc/images/qtquickcontrols-universal-dark.png
index 98701550..ec459457 100644
--- a/src/imports/controls/doc/images/qtquickcontrols-universal-dark.png
+++ b/src/imports/controls/doc/images/qtquickcontrols-universal-dark.png
diff --git a/src/templates/qquickbuttongroup.cpp b/src/templates/qquickbuttongroup.cpp
index be8c4c32..7a087300 100644
--- a/src/templates/qquickbuttongroup.cpp
+++ b/src/templates/qquickbuttongroup.cpp
@@ -233,7 +233,7 @@ void QQuickButtonGroup::setCheckedButton(QQuickAbstractButton *checkedButton)
 }
 
 /*!
-    \qmlproperty list<Object> Qt.labs.controls::ButtonGroup::buttons
+    \qmlproperty list<AbstractButton> Qt.labs.controls::ButtonGroup::buttons
     \default
 
     This property holds the list of buttons.
diff --git a/src/templates/qquickcombobox.cpp b/src/templates/qquickcombobox.cpp
index 8054dff8..d25e674c 100644
--- a/src/templates/qquickcombobox.cpp
+++ b/src/templates/qquickcombobox.cpp
@@ -165,7 +165,7 @@ public:
 
     void itemClicked();
 
-    void initItem(int index, QObject *object);
+    void createdItem(int index, QObject *object);
     void countChanged();
     void updateCurrentText();
     void increase();
@@ -235,7 +235,7 @@ void QQuickComboBoxPrivate::itemClicked()
     }
 }
 
-void QQuickComboBoxPrivate::initItem(int index, QObject *object)
+void QQuickComboBoxPrivate::createdItem(int index, QObject *object)
 {
     QQuickAbstractButton *button = qobject_cast<QQuickAbstractButton *>(object);
     if (button)
@@ -317,7 +317,7 @@ void QQuickComboBoxPrivate::createDelegateModel()
     if (oldModel) {
         disconnect(delegateModel, &QQmlInstanceModel::countChanged, this, &QQuickComboBoxPrivate::countChanged);
         disconnect(delegateModel, &QQmlInstanceModel::modelUpdated, this, &QQuickComboBoxPrivate::updateCurrentText);
-        disconnect(delegateModel, &QQmlInstanceModel::initItem, this, &QQuickComboBoxPrivate::initItem);
+        disconnect(delegateModel, &QQmlInstanceModel::createdItem, this, &QQuickComboBoxPrivate::createdItem);
     }
 
     ownModel = false;
@@ -337,7 +337,7 @@ void QQuickComboBoxPrivate::createDelegateModel()
     if (delegateModel) {
         connect(delegateModel, &QQmlInstanceModel::countChanged, this, &QQuickComboBoxPrivate::countChanged);
         connect(delegateModel, &QQmlInstanceModel::modelUpdated, this, &QQuickComboBoxPrivate::updateCurrentText);
-        connect(delegateModel, &QQmlInstanceModel::initItem, this, &QQuickComboBoxPrivate::initItem);
+        connect(delegateModel, &QQmlInstanceModel::createdItem, this, &QQuickComboBoxPrivate::createdItem);
     }
 
     emit q->delegateModelChanged();
diff --git a/src/templates/qquickscrollbar.cpp b/src/templates/qquickscrollbar.cpp
index e1e414c5..f8ce76ab 100644
--- a/src/templates/qquickscrollbar.cpp
+++ b/src/templates/qquickscrollbar.cpp
@@ -134,9 +134,9 @@ qreal QQuickScrollBarPrivate::positionAt(const QPoint &point) const
 {
     Q_Q(const QQuickScrollBar);
     if (orientation == Qt::Horizontal)
-        return point.x() / q->width();
+        return (point.x() - q->leftPadding()) / q->availableWidth();
     else
-        return point.y() / q->height();
+        return (point.y() - q->topPadding()) / q->availableHeight();
 }
 
 void QQuickScrollBarPrivate::resizeContent()