Allow attaching TextArea to a Flickable

It is not always possible to let TextArea grow infinitely, but in
some cases it should be scrollable on its own. Even though it is not
a built-in feature of TextArea like in Qt Quick Controls 1, this change
makes it straight-forward to attach TextArea to a Flickable. This makes
TextArea behave like a standalone scrollable editor.

Change-Id: I8181e8ebe0edbcdfef2c30c9e102db7cbe4ff705
Task-number: QTBUG-51677
Task-number: QTBUG-52169
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

2 files changed, 51 insertions, 1 deletions

diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-flickable.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-flickable.qml
new file mode 100644
index 00000000..e11750cb
--- /dev/null
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea-flickable.qml
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+
+Item {
+    width: 100
+    height: 100
+
+    Binding { target: flickable.ScrollBar.vertical; property: "active"; value: true }
+
+    //! [1]
+    Flickable {
+        id: flickable
+        anchors.fill: parent
+
+        TextArea.flickable: TextArea {
+            text: "TextArea\n...\n...\n...\n...\n...\n...\n"
+            wrapMode: TextArea.Wrap
+        }
+
+        ScrollBar.vertical: ScrollBar { }
+    }
+    //! [1]
+}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea.qml
index 84994008..52077f90 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textarea.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-textarea.qml
@@ -29,5 +29,5 @@ import QtQuick 2.0
 import QtQuick.Controls 2.0
 
 TextArea {
-    text: "Text\nArea..."
+    placeholderText: qsTr("Enter description")
 }