diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-07 01:00:08 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-10-08 10:00:49 +0200 |
| commit | b4da5c6b931fb726fade891448f01c266cb3c115 (patch) | |
| tree | 2f9289340da1470cf317f6670f309968da7f18e8 /src/gui | |
| parent | 05b8ba51550127c85cd2db5cb819b695b56c57ce (diff) | |
| parent | 7146c9075c85cb46cb38b57ded3e12dfa6cbef66 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/corelib/tools/qtimezoneprivate.cpp
Change-Id: Icbb5999d378711ce3786a4fe0aba176a45ac702c
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/doc/src/richtext.qdoc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/gui/doc/src/richtext.qdoc b/src/gui/doc/src/richtext.qdoc index f3bbcaf5bb..a0f739d418 100644 --- a/src/gui/doc/src/richtext.qdoc +++ b/src/gui/doc/src/richtext.qdoc @@ -975,14 +975,12 @@ \li \row \li \c meta \li Meta-information - \li If a text encoding is specified using the \c{meta} tag, - it is picked up by Qt::codecForHtml(). - Likewise, if an encoding is specified to - QTextDocument::toHtml(), the encoding is stored using - a \c meta tag, for example: - - \snippet code/doc_src_richtext.qdoc 7 - + \li If a text encoding is specified using the \c{meta} + tag, it is picked up by Qt::codecForHtml(). Likewise, + if an encoding is specified to QTextDocument::toHtml(), + the encoding is stored using a \c meta tag, for + example: + \c {<meta http-equiv="Content-Type" content="text/html; charset=EUC-JP" />} \row \li \c li \li List item \li |