summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qtextedit.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-16 18:20:02 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-16 18:20:02 (GMT)
commitfdc1359a81b983a3e4f138d11ce44f07cf38099d (patch)
tree2592013d583b5b0ab929da1195c9a2a3bc0366e7 /src/gui/widgets/qtextedit.cpp
parent7821942c39f6fa325c2bce4d16b6661289396254 (diff)
parent9ed61311bce15b8f1bb4b30ee9133f1a2355f41d (diff)
downloadQt-fdc1359a81b983a3e4f138d11ce44f07cf38099d.zip
Qt-fdc1359a81b983a3e4f138d11ce44f07cf38099d.tar.gz
Qt-fdc1359a81b983a3e4f138d11ce44f07cf38099d.tar.bz2
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Doc: Added a simple introduction to Qt and fixed links. Doc: Added more appropriate links to help reduce confusion. Doc: Removed non-ASCII characters from the documentation.
Diffstat (limited to 'src/gui/widgets/qtextedit.cpp')
-rw-r--r--src/gui/widgets/qtextedit.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp
index 6757d77..b6661c9 100644
--- a/src/gui/widgets/qtextedit.cpp
+++ b/src/gui/widgets/qtextedit.cpp
@@ -2472,6 +2472,8 @@ bool QTextEdit::find(const QString &exp, QTextDocument::FindFlags options)
and the text edit will try to guess the right format.
Use setHtml() or setPlainText() directly to avoid text edit's guessing.
+
+ \sa toPlainText(), toHtml()
*/
void QTextEdit::setText(const QString &text)
{