Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: Ic5cc4de64e4365cfbc5587c28e140d39cdda8a93

1 files changed, 13 insertions, 13 deletions

diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml
index ce4b7ded..375d195d 100644
--- a/src/controls/TextArea.qml
+++ b/src/controls/TextArea.qml
@@ -453,7 +453,7 @@ ScrollView {
     property Component menu: editMenu.defaultMenu
 
     /*!
-        \qmlmethod TextArea::append(string)
+        \qmlmethod void TextArea::append(string text)
 
         Appends \a string as a new line to the end of the text area.
     */
@@ -463,7 +463,7 @@ ScrollView {
     }
 
     /*!
-        \qmlmethod TextArea::copy()
+        \qmlmethod void TextArea::copy()
 
         Copies the currently selected text to the system clipboard.
     */
@@ -472,7 +472,7 @@ ScrollView {
     }
 
     /*!
-        \qmlmethod TextArea::cut()
+        \qmlmethod void TextArea::cut()
 
         Moves the currently selected text to the system clipboard.
     */
@@ -481,7 +481,7 @@ ScrollView {
     }
 
     /*!
-        \qmlmethod TextArea::deselect()
+        \qmlmethod void TextArea::deselect()
 
         Removes active text selection.
     */
@@ -512,7 +512,7 @@ ScrollView {
     }
 
     /*!
-        \qmlmethod TextArea::insert(int position, string text)
+        \qmlmethod void TextArea::insert(int position, string text)
 
         Inserts \a text into the TextArea at position.
     */
@@ -521,7 +521,7 @@ ScrollView {
     }
 
     /*!
-        \qmlmethod TextArea::isRightToLeft(int start, int end)
+        \qmlmethod bool TextArea::isRightToLeft(int start, int end)
 
         Returns true if the natural reading direction of the editor text
         found between positions \a start and \a end is right to left.
@@ -531,7 +531,7 @@ ScrollView {
     }
 
     /*!
-        \qmlmethod TextArea::moveCursorSelection(int position, SelectionMode mode = TextEdit.SelectCharacters)
+        \qmlmethod void TextArea::moveCursorSelection(int position, SelectionMode mode = TextEdit.SelectCharacters)
 
         Moves the cursor to \a position and updates the selection according to the optional \a mode
         parameter. (To only move the cursor, set the \l cursorPosition property.)
@@ -572,7 +572,7 @@ ScrollView {
     }
 
     /*!
-        \qmlmethod TextArea::paste()
+        \qmlmethod void TextArea::paste()
 
         Replaces the currently selected text by the contents of the system clipboard.
     */
@@ -604,7 +604,7 @@ ScrollView {
     }
 
     /*!
-        \qmlmethod TextArea::redo()
+        \qmlmethod void TextArea::redo()
 
         Redoes the last operation if redo is \l {canRedo}{available}.
     */
@@ -622,7 +622,7 @@ ScrollView {
     }
 
     /*!
-        \qmlmethod TextArea::select(int start, int end)
+        \qmlmethod void TextArea::select(int start, int end)
 
         Causes the text from \a start to \a end to be selected.
 
@@ -639,7 +639,7 @@ ScrollView {
     }
 
     /*!
-        \qmlmethod TextArea::selectAll()
+        \qmlmethod void TextArea::selectAll()
 
         Causes all text to be selected.
     */
@@ -648,7 +648,7 @@ ScrollView {
     }
 
     /*!
-        \qmlmethod TextArea::selectWord()
+        \qmlmethod void TextArea::selectWord()
 
         Causes the word closest to the current cursor position to be selected.
     */
@@ -657,7 +657,7 @@ ScrollView {
     }
 
     /*!
-        \qmlmethod TextArea::undo()
+        \qmlmethod void TextArea::undo()
 
         Undoes the last operation if undo is \l {canUndo}{available}. Deselects any
         current selection, and updates the selection start to the current cursor