diff options
| author |   Andy Shaw <andy.shaw@qt.io> | 2020-11-27 14:39:46 +0100 |
|---|---|---|
| committer |   Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-27 13:39:11 +0000 |
| commit | 716303c35a537bc38ddbdfd80ba23a884abf6978 (patch) | |
| tree | aafc6979f3794e264095e38d5829531afacf5220 /src/gui/text/qtextdocument_p.h | |
| parent | QSqlTableModel::orderByClause(): Quote the table name (diff) | |
| download | qtbase-716303c35a537bc38ddbdfd80ba23a884abf6978.tar.xz qtbase-716303c35a537bc38ddbdfd80ba23a884abf6978.zip | |
Write out the HTML correctly for nested lists
When we are having nested lists then we need to ensure that the HTML is
outputted correctly so that the closing list and item tags are placed
in the right order.
[ChangeLog][QtGui][QTextDocument] The output of toHtml() now handles
nested lists correctly.
Fixes: QTBUG-88374
Change-Id: I88afba0f897aeef78d4835a3124097fe6fd4d55e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 72a5151403f107c445e20cf548ca2e7309c88ce7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/gui/text/qtextdocument_p.h')
| -rw-r--r-- | src/gui/text/qtextdocument_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h index 35cedc67c0..d90710586a 100644 --- a/src/gui/text/qtextdocument_p.h +++ b/src/gui/text/qtextdocument_p.h @@ -405,6 +405,7 @@ private: QTextCharFormat defaultCharFormat; const QTextDocument *doc; bool fragmentMarkers; + QStringList closingTags; }; QT_END_NAMESPACE |