diff options
| author | Samuel Rødal <samuel.rodal@digia.com> | 2012-11-22 12:36:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-22 14:10:05 +0100 |
| commit | 57246c7515889d82a81a95043f51a9f42d902216 (patch) | |
| tree | 7561866c6519214cbced27f9861c988b69bf4c2d | |
| parent | aba67cc3f020f03d8ed8ef5303d413044031bc58 (diff) | |
Improved documentation of Text.textFormat property.
Even though using RichText is not recommended, we should still at least
point out what it does.
Change-Id: I96d0e1e7074b5fdbb3a5dcaf84e5afe805c92080
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 14c386d633..01136d56de 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -1908,7 +1908,7 @@ void QQuickText::resetMaximumLineCount() there is no guarantee. Text.StyledText is an optimized format supporting some basic text - styling markup, in the style of html 3.2: + styling markup, in the style of HTML 3.2: \code <b></b> - bold @@ -1951,6 +1951,10 @@ Column { \endqml \li \image declarative-textformat.png \endtable + + Text.RichText supports a larger subset of HTML 4, as described on the + \l {Supported HTML Subset} page. You should prefer using Text.PlainText + or Text.StyledText instead, as they offer better performance. */ QQuickText::TextFormat QQuickText::textFormat() const { |