From a9aa500a680058d7f2a75f02ad8d72c4b1e49f7c Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 18 Jan 2017 16:29:14 +0100 Subject: Add ScrollView [ChangeLog][Controls][ScrollView] Added ScrollView. Change-Id: I5d68799f0246e04b519bf6a0ec7bc7e5625f50e7 Reviewed-by: Mitch Curtis Reviewed-by: Qt CI Bot --- .../controls/doc/src/qtquickcontrols2-differences.qdoc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc') 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