From a9aa500a680058d7f2a75f02ad8d72c4b1e49f7c Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Wed, 18 Jan 2017 16:29:14 +0100
Subject: Add ScrollView

[ChangeLog][Controls][ScrollView] Added ScrollView.

Change-Id: I5d68799f0246e04b519bf6a0ec7bc7e5625f50e7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc |  6 ++++++
 src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc  | 10 ++++++++++
 .../controls/doc/src/qtquickcontrols2-differences.qdoc        | 11 +++--------
 3 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'src/imports/controls/doc/src')

diff --git a/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc
index 139958e0..73cfd989 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-containers.qdoc
@@ -78,6 +78,12 @@
     you to position its contents, for instance by using a \l RowLayout or
     a \l ColumnLayout.
 
+    \section1 ScrollView Control
+
+    \image qtquickcontrols2-scrollview-wireframe.png
+
+    \l ScrollView provides scrolling for user-defined content.
+
     \section1 StackView Control
 
     \image qtquickcontrols2-stackview-wireframe.png
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
index 6ef019f6..487c5d6f 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
@@ -636,6 +636,16 @@
         \snippet qtquickcontrols2-scrollindicator-custom.qml file
 
 
+    \section2 Customizing ScrollView
+
+        ScrollView consists of a \l {Control::background}{background} item,
+        and horizontal and vertical scroll bars.
+
+        \image qtquickcontrols2-scrollview-custom.png
+
+        \snippet qtquickcontrols2-scrollview-custom.qml file
+
+
     \section2 Customizing Slider
 
         Slider consists of two visual items: \l {Control::background}{background},
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
index 3423e423..dd86d2ed 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
@@ -328,14 +328,9 @@
         \li
     \row
         \li \l [QML QtQuickControls] {ScrollView}
-        \li \mdash
-        \li \l [QML QtQuickControls2] {ScrollBar},\br
-            \l [QML QtQuickControls2] {ScrollIndicator} \br\sup {(Qt Quick Controls 2)}
-        \li \list
-                \li \b {Qt Quick Controls 2}: \c ScrollBar and \c ScrollIndicator offer
-                    similar functionality. They can be attached to any \c Flickable to
-                    build scrollable views.
-            \endlist
+        \li \l [QML QtQuickControls2] {ScrollView}
+        \li
+        \li
     \row
         \li \l [QML QtQuickControls] {Slider}
         \li \l [QML QtQuickControls2] {Slider}
-- 
cgit v1.2.3