diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-03 14:20:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 11:12:05 +0100 |
| commit | ca2f44680cb97e7a7c46ee0ab26654822fe65e2d (patch) | |
| tree | b9d85ad8ec1b18a6aa56b7657812cf3791bdf72e /src/gui/doc/src/richtext.qdoc | |
| parent | 28a21d98ef8d880a6dd86ee19dd803424bb5eae1 (diff) | |
| parent | 83188c6499ccdc87c0a2c468bb497e287f5db369 (diff) | |
Merge branch 'stable' into dev
Conflicts:
examples/widgets/painting/shared/shared.pri
src/corelib/tools/qharfbuzz_p.h
src/corelib/tools/qunicodetools.cpp
src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
Diffstat (limited to 'src/gui/doc/src/richtext.qdoc')
| -rw-r--r-- | src/gui/doc/src/richtext.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/doc/src/richtext.qdoc b/src/gui/doc/src/richtext.qdoc index b4ba4ba6c4..448c42631b 100644 --- a/src/gui/doc/src/richtext.qdoc +++ b/src/gui/doc/src/richtext.qdoc @@ -851,7 +851,7 @@ \contentspage richtext.html Contents \previouspage Common Rich Text Editing Tasks - Qt's text widgets are able to display rich text, specified using a subset of \l{HTML 4} + Qt's text widgets are able to display rich text, specified using a subset of \l {http://www.w3.org/TR/html401/}{HTML 4} markup. Widgets that use QTextDocument, such as QLabel and QTextEdit, are able to display rich text specified in this way. @@ -863,7 +863,7 @@ setting a label's \l{QLabel::}{text} property with the string \c{"<b>Hello</b> <i>Qt!</i>"} will result in the label displaying text like this: \b{Hello} \e{Qt!} - When HTML markup is used for text, Qt follows the rules defined by the \l{HTML 4} + When HTML markup is used for text, Qt follows the rules defined by the \l{http://www.w3.org/TR/html401/}{HTML 4} specification. This includes default properties for text layout, such as the direction of the text flow (left-to-right) which can be changed by applying the \l{#Block Attributes}{\c dir} attribute to blocks of text. |