uic: Generate QFont::Weight

Check for the new "fontweight" attribute before "bold".

Pick-to: 6.6 6.5
Task-number: QTBUG-113670
Change-Id: Ib34ab5a19872adb3c063861ffbe6b2d3374afcaa
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

1 files changed, 18 insertions, 0 deletions

diff --git a/src/tools/uic/ui4.cpp b/src/tools/uic/ui4.cpp
index 5c9240a5c9..d65fc4a8c3 100644
--- a/src/tools/uic/ui4.cpp
+++ b/src/tools/uic/ui4.cpp
@@ -3125,6 +3125,10 @@ void DomFont::read(QXmlStreamReader &reader)
                 setElementHintingPreference(reader.readElementText());
                 continue;
             }
+            if (!tag.compare(u"fontweight"_s, Qt::CaseInsensitive)) {
+                setElementFontWeight(reader.readElementText());
+                continue;
+            }
             reader.raiseError("Unexpected element "_L1 + tag);
         }
             break;
@@ -3173,6 +3177,9 @@ void DomFont::write(QXmlStreamWriter &writer, const QString &tagName) const
     if (m_children & HintingPreference)
         writer.writeTextElement(u"hintingpreference"_s, m_hintingPreference);
 
+    if (m_children & FontWeight)
+        writer.writeTextElement(u"fontweight"_s, m_fontWeight);
+
     writer.writeEndElement();
 }
 
@@ -3242,6 +3249,12 @@ void DomFont::setElementHintingPreference(const QString &a)
     m_hintingPreference = a;
 }
 
+void DomFont::setElementFontWeight(const QString &a)
+{
+    m_children |= FontWeight;
+    m_fontWeight = a;
+}
+
 void DomFont::clearElementFamily()
 {
     m_children &= ~Family;
@@ -3297,6 +3310,11 @@ void DomFont::clearElementHintingPreference()
     m_children &= ~HintingPreference;
 }
 
+void DomFont::clearElementFontWeight()
+{
+    m_children &= ~FontWeight;
+}
+
 DomPoint::~DomPoint() = default;
 
 void DomPoint::read(QXmlStreamReader &reader)