6 files changed, 54 insertions, 2 deletions
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textarea-flickable.png b/src/imports/controls/doc/images/qtquickcontrols2-textarea-flickable.png
new file mode 100644
index 00000000..39578f71
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textarea-flickable.png
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textarea.png b/src/imports/controls/doc/images/qtquickcontrols2-textarea.png
index f468bfd4..924f6681 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textarea.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textarea.png
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")
 }
diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml
index aa9cb12f..8098ac42 100644
--- a/src/imports/controls/material/TextArea.qml
+++ b/src/imports/controls/material/TextArea.qml
@@ -56,6 +56,7 @@ T.TextArea {
     selectedTextColor: Material.primaryHighlightedTextColor
     cursorDelegate: Rectangle {
         id: cursor
+        clip: true // TODO
         color: control.Material.accentColor
         width: 2
         visible: control.activeFocus && control.selectionStart === control.selectionEnd
@@ -99,7 +100,7 @@ T.TextArea {
 
     //! [background]
     background: Rectangle {
-        y: control.height - height - control.bottomPadding / 2
+        y: parent.height - height - control.bottomPadding / 2
         implicitWidth: 120
         height: control.activeFocus ? 2 : 1
         color: control.activeFocus ? control.Material.accentColor : control.Material.hintTextColor
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp
index 86adf973..ab46c7ab 100644
--- a/src/imports/templates/qtquicktemplates2plugin.cpp
+++ b/src/imports/templates/qtquicktemplates2plugin.cpp
@@ -148,6 +148,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri)
     qmlRegisterType<QQuickSwitchDelegate>(uri, 2, 0, "SwitchDelegate");
     qmlRegisterType<QQuickTabBar>(uri, 2, 0, "TabBar");
     qmlRegisterType<QQuickTabButton>(uri, 2, 0, "TabButton");
+    qmlRegisterType<QQuickTextAreaAttached>();
     qmlRegisterType<QQuickTextArea>(uri, 2, 0, "TextArea");
     qmlRegisterType<QQuickTextField>(uri, 2, 0, "TextField");
     qmlRegisterType<QQuickToolBar>(uri, 2, 0, "ToolBar");