From d23c118fd4b733b60bb41ee07c6a91d914afd129 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 1 Sep 2020 15:41:46 +0200
Subject: [PATCH] QTextHtmlParserNode: Fix warnings flood about setting
 negative pixel size
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/gui/text/qtexthtmlparser.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)