diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 01:00:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 01:00:20 +0200 |
| commit | 0131462861ef2aef9fef97a4490dc12f07b7545a (patch) | |
| tree | bbcfc40e90b39aacf7d62538416a70115165b293 /src/gui/text/qtextformat.cpp | |
| parent | 49362d064fffe350600f5324fb510b381578d04a (diff) | |
| parent | dc4ecf0641de34836c51947a14abdc419204ef6d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/gui/text/qtextformat.cpp')
| -rw-r--r-- | src/gui/text/qtextformat.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index 47a38db3ad..e3bd49a15e 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -650,6 +650,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt) \value TableColumns \value TableColumnWidthConstraints \value TableHeaderRowCount + \value TableBorderCollapse Specifies the \l QTextTableFormat::borderCollapse property. Table cell properties |