summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qtextedit.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-11-17 17:41:58 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-11-17 17:42:39 (GMT)
commit484a6043ef84df3d0d01a19247ea2c89eb8b309f (patch)
tree43cbe0e0da00eff1f82a8ac5a641453cb730ce40 /src/gui/widgets/qtextedit.cpp
parent67b7d3ee2c30a710e765252a29ecb9a0ffd0a7a6 (diff)
parenta61adccf96a8ceefbf1150966adda3f6d226ec6d (diff)
downloadQt-484a6043ef84df3d0d01a19247ea2c89eb8b309f.zip
Qt-484a6043ef84df3d0d01a19247ea2c89eb8b309f.tar.gz
Qt-484a6043ef84df3d0d01a19247ea2c89eb8b309f.tar.bz2
Merge upstream/4.6 into oslo-staging-2
Diffstat (limited to 'src/gui/widgets/qtextedit.cpp')
-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 3a4d77d..1c49ef0 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.
@@ -1904,7 +1906,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