5 files changed, 21 insertions, 21 deletions
diff --git a/src/controls/ScrollArea.qml b/src/controls/ScrollView.qml
index 5bdba3b5c..21812b5a8 100644
--- a/src/controls/ScrollArea.qml
+++ b/src/controls/ScrollView.qml
@@ -43,21 +43,21 @@ import QtQuick.Controls 1.0
 import QtQuick.Controls.Private 1.0
 
 /*!
-    \qmltype ScrollArea
+    \qmltype ScrollView
     \inqmlmodule QtQuick.Controls 1.0
     \ingroup navigation
-    \brief The ScrollArea class provides a scrolling view onto another Item.
+    \brief The ScrollView class provides a scrolling view onto another Item.
 
-    A ScrollArea can be used either instead of a \l Flickable or to decorate an
+    A ScrollView can be used either instead of a \l Flickable or to decorate an
     existing Flickable. Depending on the platform it will add scroll bars and
     a content frame.
 
-    Only one Item can be a direct child of the ScrollArea and the child is implicitly anchored
+    Only one Item can be a direct child of the ScrollView and the child is implicitly anchored
     to fill the scroll view.
 
     Example:
     \code
-    ScrollArea {
+    ScrollView {
         Image { imageSource: "largeImage.png" }
     }
     \endcode
@@ -68,14 +68,14 @@ import QtQuick.Controls.Private 1.0
 
     Example:
     \code
-    ScrollArea {
+    ScrollView {
         ListView {
             ...
         }
     }
     \endcode
 
-    In this case the content size of the ScrollArea will simply mirror that of its contained
+    In this case the content size of the ScrollView will simply mirror that of its contained
     \l flickableItem.
 
 */
@@ -86,7 +86,7 @@ FocusScope {
     implicitHeight: 100
 
     /*!
-        This property tells the scroll area if it should render
+        This property tells the scroll view if it should render
         a frame around it's content.
 
         The default value is \c false
@@ -95,7 +95,7 @@ FocusScope {
 
     /*!
         This property controls if there should be a highlight
-        around the frame when the ScrollArea has input focus.
+        around the frame when the ScrollView has input focus.
 
         The default value is \c false
 
@@ -105,7 +105,7 @@ FocusScope {
     property bool highlightOnFocus: false
 
     /*!
-        \qmlproperty Item ScrollArea::viewport
+        \qmlproperty Item ScrollView::viewport
 
         The viewport determines the current "window" on to the contentItem.
         In other words it clips it and the size of the viewport tells you
@@ -114,15 +114,15 @@ FocusScope {
     property alias viewport: viewportItem
 
     /*!
-        \qmlproperty Item ScrollArea::flickableItem
+        \qmlproperty Item ScrollView::flickableItem
 
-        The flickableItem of the ScrollArea. If the contentItem provided
-        to the ScrollArea is a Flickable, it will be the \l contentItem.
+        The flickableItem of the ScrollView. If the contentItem provided
+        to the ScrollView is a Flickable, it will be the \l contentItem.
     */
     readonly property alias flickableItem: internal.flickableItem
 
     /*!
-        The contentItem of the ScrollArea. This is set by the user.
+        The contentItem of the ScrollView. This is set by the user.
 
         Note that the definition of contentItem is somewhat different to that
         of a Flickable, where the contentItem is implicitly created.
@@ -249,7 +249,7 @@ FocusScope {
             }
         }
 
-        ScrollAreaHelper {
+        ScrollViewHelper {
             id: scroller
             anchors.fill: parent
             property int frameWidth: frame ? styleitem.pixelMetric("defaultframewidth") : 0
diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml
index 2f200c3ab..d61c9945b 100644
--- a/src/controls/TableView.qml
+++ b/src/controls/TableView.qml
@@ -92,7 +92,7 @@ import QtQuick.Controls.Private 1.0
 \endlist
 */
 
-ScrollArea {
+ScrollView {
     id: root
 
     /*! This property holds the model providing data for the list.
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml
index 6a39c73ca..f697581f8 100644
--- a/src/controls/TextArea.qml
+++ b/src/controls/TextArea.qml
@@ -66,7 +66,7 @@ import QtQuick.Controls.Private 1.0
     \sa TextField, TextEdit
 */
 
-ScrollArea {
+ScrollView {
     id: area
 
     /*!
@@ -572,7 +572,7 @@ ScrollArea {
     }
 
     /*!
-        \qmlproperty color ScrollArea:backgroundColor
+        \qmlproperty color ScrollView:backgroundColor
 
         This property sets the background color of the viewport.
 
@@ -630,7 +630,7 @@ ScrollArea {
         KeyNavigation.tab: area.tabChangesFocus ? area.KeyNavigation.tab : null
         KeyNavigation.backtab: area.tabChangesFocus ? area.KeyNavigation.backtab : null
 
-        // keep textcursor within scrollarea
+        // keep textcursor within scroll view
         onCursorPositionChanged: {
             if (cursorRectangle.y >= flickableItem.contentY + viewport.height - 1.5*cursorRectangle.height - documentMargins)
                 flickableItem.contentY = cursorRectangle.y - viewport.height + 1.5*cursorRectangle.height + documentMargins
diff --git a/src/controls/controls.pro b/src/controls/controls.pro
index 7af5a965f..1324aa51d 100644
--- a/src/controls/controls.pro
+++ b/src/controls/controls.pro
@@ -23,7 +23,7 @@ QML_FILES = \
     PageTransition.qml \
     ProgressBar.qml \
     RadioButton.qml \
-    ScrollArea.qml \
+    ScrollView.qml \
     Slider.qml \
     SpinBox.qml \
     Splitter.qml \
diff --git a/src/controls/qmldir b/src/controls/qmldir
index b3de1110b..6543c8ae9 100644
--- a/src/controls/qmldir
+++ b/src/controls/qmldir
@@ -15,7 +15,7 @@ PageStack 1.0 PageStack.qml
 PageTransition 1.0 PageTransition.qml
 ProgressBar 1.0 ProgressBar.qml
 RadioButton 1.0 RadioButton.qml
-ScrollArea 1.0 ScrollArea.qml
+ScrollView 1.0 ScrollView.qml
 Slider 1.0 Slider.qml
 SpinBox 1.0 SpinBox.qml
 Splitter 1.0 Splitter.qml