diff options
| author | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-07 22:23:53 +0000 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-07 22:23:53 +0000 |
| commit | e1cfbc10de901346213f35c85d0fa29fe6f60f67 (patch) | |
| tree | 2b74fc94de46d3822c8ed181290f668f7e712d04 /src/gui | |
| parent | b187ce87f90d9d63d5c892b93858afaa8262cea1 (diff) | |
| parent | 7473317b52dbc15878d81291faa33f21c20d6ec6 (diff) | |
Merge integration refs/builds/qtci/dev/1617826149
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qtexthtmlparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp index ed1c6d97f6..a242d5e645 100644 --- a/src/gui/text/qtexthtmlparser.cpp +++ b/src/gui/text/qtexthtmlparser.cpp @@ -1670,7 +1670,7 @@ void QTextHtmlParser::applyAttributes(const QStringList &attributes) node->tableCellRowSpan = qMax(1, node->tableCellRowSpan); } else if (key == QLatin1String("colspan")) { if (setIntAttribute(&node->tableCellColSpan, value)) - node->tableCellColSpan = qMax(1, node->tableCellColSpan); + node->tableCellColSpan = qBound(1, node->tableCellColSpan, 20480); } break; case Html_table: |