diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-01 15:41:46 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-02 00:13:24 +0200 |
| commit | d23c118fd4b733b60bb41ee07c6a91d914afd129 (patch) | |
| tree | 8e88d724b905c8408216084d434568add224b84c /src/gui/text | |
| parent | 11b8c46d2acf5421a8c57c02a55c3a36a11cf4f2 (diff) | |
QTextHtmlParserNode: Fix warnings flood about setting negative pixel size
Exclude the default value (-1) from the check.
Amends 0bd770fb875d5391dd78df95542c25bd15051938.
Pick-to: 5.12 5.15 5.15.1
Change-Id: Ib98ae166fd5fdab546c5d4212ce78345b5c9b583
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/text')
| -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 c2a0fcbec9..9bfb0d0ec8 100644 --- a/src/gui/text/qtexthtmlparser.cpp +++ b/src/gui/text/qtexthtmlparser.cpp @@ -1381,7 +1381,8 @@ void QTextHtmlParserNode::applyCssDeclarations(const QList<QCss::Declaration> &d 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) |