diff options
| author | Jonas Karlsson <jonas.karlsson@qt.io> | 2020-08-05 10:47:33 +0200 |
|---|---|---|
| committer | Jonas Karlsson <jonas.karlsson@qt.io> | 2020-08-28 07:26:54 +0200 |
| commit | 3558704ed5c3d2c6dc6d024dfa454997469ca75f (patch) | |
| tree | 84fe1b1d8314a389b480b7e720574573c3bd2083 /src/tools/uic/ui4.cpp | |
| parent | eb98bed4e76bb0fa6bad8474f2f370334cb70f6c (diff) | |
Use OpenType font weights
Task-number: QTBUG-42248
Change-Id: Icdb301b27d6699c2b842c4563fbef9df73c23cbc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/tools/uic/ui4.cpp')
| -rw-r--r-- | src/tools/uic/ui4.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/tools/uic/ui4.cpp b/src/tools/uic/ui4.cpp index a155df9b6c..8a535582b9 100644 --- a/src/tools/uic/ui4.cpp +++ b/src/tools/uic/ui4.cpp @@ -3099,6 +3099,16 @@ DomFont::~DomFont() = default; void DomFont::read(QXmlStreamReader &reader) { + const QXmlStreamAttributes &attributes = reader.attributes(); + for (const QXmlStreamAttribute &attribute : attributes) { + const auto name = attribute.name(); + if (name == QLatin1String("scale")) { + setAttributeScale(attribute.value().toString()); + continue; + } + reader.raiseError(QLatin1String("Unexpected attribute ") + name); + } + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { @@ -3158,6 +3168,9 @@ void DomFont::write(QXmlStreamWriter &writer, const QString &tagName) const { writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("font") : tagName.toLower()); + if (hasAttributeScale()) + writer.writeAttribute(QStringLiteral("scale"), attributeScale()); + if (m_children & Family) writer.writeTextElement(QStringLiteral("family"), m_family); |