summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-11-17 13:22:03 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-11-17 13:22:03 (GMT)
commitfaf6d0de6e3b8168fbd6f04c5380f47d350e2a22 (patch)
treed3c35778ad9c7abe68b681b39dd004027fd50880 /src/gui/widgets
parent3a92f40e1faf4d81f5071a66558b051a9fda727e (diff)
parent499a9aaabad0756cbca7b39751684308a6ba88ea (diff)
downloadQt-faf6d0de6e3b8168fbd6f04c5380f47d350e2a22.zip
Qt-faf6d0de6e3b8168fbd6f04c5380f47d350e2a22.tar.gz
Qt-faf6d0de6e3b8168fbd6f04c5380f47d350e2a22.tar.bz2
Merge remote branch 'staging/4.6' into 4.6
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/qtextedit.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp
index 88502e3..998ab4f 100644
--- a/src/gui/widgets/qtextedit.cpp
+++ b/src/gui/widgets/qtextedit.cpp
@@ -530,7 +530,9 @@ void QTextEditPrivate::_q_ensureVisible(const QRectF &_rect)
when the property is set.
If the text edit has another content type, it will not be replaced
- by plain text if you call toPlainText().
+ by plain text if you call toPlainText(). The only exception to this
+ is the non-break space, \e{nbsp;}, that will be converted into
+ standard space.
By default, for an editor with no contents, this property contains
an empty string.
@@ -1899,7 +1901,7 @@ void QTextEdit::setOverwriteMode(bool overwrite)
\brief the tab stop width in pixels
\since 4.1
- By default, this property contains a value of 80.
+ By default, this property contains a value of 80 pixels.
*/
int QTextEdit::tabStopWidth() const