diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-01 15:41:46 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-09-02 01:33:12 +0000 |
| commit | afc0b053494762f0d52f63023c4ccf5487ddea23 (patch) | |
| tree | 49fd63855194377ef21094ea4e123279e1c86986 /src/gui | |
| parent | 0c4d476e8ac7f37740fda2432bafc6dc59252ff3 (diff) | |
QTextHtmlParserNode: Fix warnings flood about setting negative pixel size
Exclude the default value (-1) from the check.
Amends 0bd770fb875d5391dd78df95542c25bd15051938.
Change-Id: Ib98ae166fd5fdab546c5d4212ce78345b5c9b583
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit d23c118fd4b733b60bb41ee07c6a91d914afd129)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qtexthtmlparser.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp index d22fc3b913..8b58f69770 100644 --- a/src/gui/text/qtexthtmlparser.cpp +++ b/src/gui/text/qtexthtmlparser.cpp @@ -1388,7 +1388,8 @@ void QTextHtmlParserNode::applyCssDeclarations(const QVector<QCss::Declaration> QFont f; int adjustment = -255; extractor.extractFont(&f, &adjustment); - f.setPixelSize(qMin(f.pixelSize(), INT32_MAX / 2)); // avoid even more extreme values + if (f.pixelSize() > INT32_MAX / 2) + f.setPixelSize(INT32_MAX / 2); // avoid even more extreme values charFormat.setFont(f, QTextCharFormat::FontPropertiesSpecifiedOnly); if (adjustment >= -1) |