summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qtextedit.cpp
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@digia.com>2012-11-22 12:04:40 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-23 10:08:10 +0100
commit6a9b7130710577245a0731f7b47ad4c4b16c882d (patch)
tree698d2850512a28bb6a5adf47c20c723b831863e2 /src/widgets/widgets/qtextedit.cpp
parentd6cfd2c5223297efb286bf38b9706ed60e8893cc (diff)
Add pointers to the rich text documentation from mentions of rich text.
The QLabel documentation for instance is quite confusing since it talks about rich text without saying what it actually is. The QTextEdit documentation can also be improved by being more explicit. Change-Id: Ie718d170e18a0b713fe567fb707330d0085fb9e4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/widgets/widgets/qtextedit.cpp')
-rw-r--r--src/widgets/widgets/qtextedit.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index 192e0f54ac..9f7d66b344 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -358,8 +358,9 @@ void QTextEditPrivate::_q_ensureVisible(const QRectF &_rect)
QTextEdit can display images, lists and tables. If the text is
too large to view within the text edit's viewport, scroll bars will
- appear. The text edit can load both plain text and HTML files (a
- subset of HTML 3.2 and 4).
+ appear. The text edit can load both plain text and rich text files.
+ Rich text is described using a subset of HTML 4 markup, refer to the
+ \l {Supported HTML Subset} page for more information.
If you just need to display a small piece of rich text use QLabel.