diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:16:29 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:23:19 +0200 |
commit | f4b4c4f79b629498f3cddbbc10df8c1b4d6020d9 (patch) | |
tree | 4119707660438ff58bd51f9cbe0f9e2a33f4b806 /src/gui/doc/src/richtext.qdoc | |
parent | 9bd6cec74dbbc5aece55dc0c8808494db29b9963 (diff) | |
parent | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (diff) |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c
Diffstat (limited to 'src/gui/doc/src/richtext.qdoc')
-rw-r--r-- | src/gui/doc/src/richtext.qdoc | 69 |
1 files changed, 66 insertions, 3 deletions
diff --git a/src/gui/doc/src/richtext.qdoc b/src/gui/doc/src/richtext.qdoc index a8ba076e3d..24fd4240b3 100644 --- a/src/gui/doc/src/richtext.qdoc +++ b/src/gui/doc/src/richtext.qdoc @@ -1175,12 +1175,75 @@ \row \li \c vertical-align \li baseline | sub | super | middle | top | bottom \li Vertical text alignment. For vertical alignment in text table cells only middle, top, and bottom apply. + \row \li \c border-collapse + \li collapse | separate + \li Border Collapse mode for text tables. If set to collapse, cell-spacing will not be applied. \row \li \c border-color \li <color> - \li Border color for text tables. + \li Border color for text tables and table cells. + \row \li \c border-top-color + \li <color> + \li Top border color for table cells. + \row \li \c border-bottom-color + \li <color> + \li Bottom border color for table cells. + \row \li \c border-left-color + \li <color> + \li Left border color for table cells. + \row \li \c border-right-color + \li <color> + \li Right border color for table cells. \row \li \c border-style \li none | dotted | dashed | dot-dash | dot-dot-dash | solid | double | groove | ridge | inset | outset - \li Border style for text tables. + \li Border style for text tables and table cells. + \row \li \c border-top-style + \li <color> + \li Top border style for table cells. + \row \li \c border-bottom-style + \li <color> + \li Bottom border style for table cells. + \row \li \c border-left-style + \li <color> + \li Left border style for table cells. + \row \li \c border-right-style + \li <color> + \li Right border style for table cells. + \row \li \c border-width + \li <width>px + \li Width of table or cell border + \row \li \c border-top-width + \li <length>px + \li Top border width for table cells. + \row \li \c border-bottom-width + \li <length>px + \li Bottom border width for table cells. + \row \li \c border-left-width + \li <length>px + \li Left border width for table cells. + \row \li \c border-right-width + \li <length>px + \li Right border width for table cells. + \row \li \c border-top + \li <width>px <border-style> <border-color> + \li Shorthand for setting top border width, style and color + \row \li \c border-bottom + \li <width>px <border-style> <border-color> + \li Shorthand for setting bottom border width, style and color + \row \li \c border-left + \li <width>px <border-style> <border-color> + \li Shorthand for setting left border width, style and color + \row \li \c border-right + \li <width>px <border-style> <border-color> + \li Shorthand for setting right border width, style and color + \row \li \c border-top + \li <width>px <border-style> <border-color> + \li Shorthand for setting top border width, style and color + \row \li \c border-bottom + \li <width>px <border-style> <border-color> + \li Shorthand for setting bottom border width, style and color + \row \li \c border + \li <width>px <border-style> <border-color> + \li Shorthand for setting all four border's width, style and color \row \li \c background \li [ <'background-color'> || <'background-image'> ] \li Background shorthand property @@ -1190,7 +1253,7 @@ \row \li \c page-break-after \li [ auto | always ] \li Make it possible to enforce a page break after the paragraph/table - \row \li float + \row \li \c float \li [ left | right | none ] \li Specifies where an image or a text will be placed in another element. Note that the \c float property is only supported for tables and images. |