summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2014-04-01 23:17:52 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-02 16:54:26 +0200
commitcca3c68333431431aca9b904b6582de7220175b8 (patch)
treec1e2476dcbd33ab6b7efdc8db52f4b20093dd510
parent644728a2120880c2f8c9b32ce496efd6158a1107 (diff)
downloadqtquickcontrols-cca3c68333431431aca9b904b6582de7220175b8.tar.gz
Update TextArea::wrapMode docs
The documentation adapted from TextEdit mentioned a wrong default value and contained confusing and unnecessary low-level details how TextEdit calculates its content/implicitWidth. TextArea hides these details and the documentation has been simplified accordingly. Task-number: QTBUG-38022 Change-Id: Ifa29956b59b7f169fbdc94f455dbdad29469db3e Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
-rw-r--r--src/controls/TextArea.qml7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml
index 876a2270..82265075 100644
--- a/src/controls/TextArea.qml
+++ b/src/controls/TextArea.qml
@@ -337,16 +337,13 @@ ScrollView {
\qmlproperty enumeration TextArea::wrapMode
Set this property to wrap the text to the TextArea item's width.
- The text will only wrap if an explicit width has been set.
\list
- \li TextEdit.NoWrap - no wrapping will be performed. If the text contains insufficient newlines, then implicitWidth will exceed a set width.
- \li TextEdit.WordWrap - wrapping is done on word boundaries only. If a word is too long, implicitWidth will exceed a set width.
+ \li TextEdit.NoWrap - no wrapping will be performed.
+ \li TextEdit.WordWrap (default) - wrapping is done on word boundaries only.
\li TextEdit.WrapAnywhere - wrapping is done at any point on a line, even if it occurs in the middle of a word.
\li TextEdit.Wrap - if possible, wrapping occurs at a word boundary; otherwise it will occur at the appropriate point on the line, even in the middle of a word.
\endlist
-
- The default is \c TextEdit.NoWrap. If you set a width, consider using TextEdit.Wrap.
*/
property alias wrapMode: edit.wrapMode