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, 30 insertions, 3 deletions

diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp
index ebccbcba..06cc8832 100644
--- a/src/quicktemplates2/qquickscrollbar.cpp
+++ b/src/quicktemplates2/qquickscrollbar.cpp
@@ -65,9 +65,9 @@ QT_BEGIN_NAMESPACE
     }
     \endcode
 
-    \note When ScrollBar is attached \l {ScrollBar::vertical}{vertically} or
-    \l {ScrollBar::horizontal}{horizontally} to a Flickable, its geometry and
-    the following properties are automatically set and updated as appropriate:
+    When ScrollBar is attached \l {ScrollBar::vertical}{vertically} or
+    \l {ScrollBar::horizontal}{horizontally} to a Flickable, the following
+    properties are automatically set and updated as appropriate:
     \list
     \li \l orientation
     \li \l position
@@ -75,6 +75,29 @@ QT_BEGIN_NAMESPACE
     \li \l active
     \endlist
 
+    An attached ScrollBar re-parents itself to the target Flickable. A vertically
+    attached ScrollBar resizes itself to the height of the Flickable, and positions
+    itself to either side of it based on the \l {Control::mirrored}{layout direction}.
+    A horizontally attached ScrollBar resizes itself to the width of the Flickable,
+    and positions itself to the bottom. The automatic geometry management can be disabled
+    by specifying another parent for the attached ScrollBar. This can be useful, for
+    example, if the ScrollBar should be placed outside a clipping Flickable. This is
+    demonstrated by the following example:
+
+    \code
+    Flickable {
+        id: flickable
+        clip: true
+        // ...
+        ScrollBar.vertical: ScrollBar {
+            parent: flickable.parent
+            anchors.top: flickable.top
+            anchors.left: flickable.right
+            anchors.bottom: flickable.bottom
+        }
+    }
+    \endcode
+
     Notice that ScrollBar does not filter key events of the Flickable it is
     attached to. The following example illustrates how to implement scrolling
     with up and down keys:
@@ -477,6 +500,8 @@ void QQuickScrollBarAttachedPrivate::mirrorVertical()
 void QQuickScrollBarAttachedPrivate::layoutHorizontal(bool move)
 {
     Q_ASSERT(horizontal && flickable);
+    if (horizontal->parentItem() != flickable)
+        return;
     horizontal->setWidth(flickable->width());
     if (move)
         horizontal->setY(flickable->height() - horizontal->height());
@@ -485,6 +510,8 @@ void QQuickScrollBarAttachedPrivate::layoutHorizontal(bool move)
 void QQuickScrollBarAttachedPrivate::layoutVertical(bool move)
 {
     Q_ASSERT(vertical && flickable);
+    if (vertical->parentItem() != flickable)
+        return;
     vertical->setHeight(flickable->height());
     if (move)
         vertical->setX(vertical->isMirrored() ? 0 : flickable->width() - vertical->width());