diff options
author | Samuel Rødal <samuel.rodal@digia.com> | 2012-11-22 12:04:40 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-23 10:08:10 +0100 |
commit | 6a9b7130710577245a0731f7b47ad4c4b16c882d (patch) | |
tree | 698d2850512a28bb6a5adf47c20c723b831863e2 /src/widgets/widgets/qlabel.cpp | |
parent | d6cfd2c5223297efb286bf38b9706ed60e8893cc (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/qlabel.cpp')
-rw-r--r-- | src/widgets/widgets/qlabel.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index d4ba3b2265..2f12a11e60 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -95,7 +95,8 @@ QT_BEGIN_NAMESPACE \warning When passing a QString to the constructor or calling setText(), make sure to sanitize your input, as QLabel tries to guess whether it - displays the text as plain text or as rich text. You may want to call + displays the text as plain text or as rich text, a subset of HTML 4 + markup. You may want to call setTextFormat() explicitly, e.g. in case you expect the text to be in plain format but cannot control the text source (for instance when displaying data loaded from the Web). @@ -259,6 +260,7 @@ void QLabelPrivate::init() text, depending on the text format setting; see setTextFormat(). The default setting is Qt::AutoText; i.e. QLabel will try to auto-detect the format of the text set. + See \l {Supported HTML Subset} for the definition of rich text. If a buddy has been set, the buddy mnemonic key is updated from the new text. |