From b336de30c1525e19b4691591c11d020962d2b530 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 27 Jun 2023 10:51:18 +0200 Subject: Adapt to changes in QFont::features API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This API was changed after review, so we need to adapt. Change-Id: I13c52e3a4cb7ce2b5a50ec5af9a12bdd00da8775 Reviewed-by: Kaj Grönholm Reviewed-by: Volker Hilsheimer (cherry picked from commit d623bba84abd4652db0ab5955170e0556e3b3ca0) Reviewed-by: Qt Cherry-pick Bot --- src/quick/util/qquickvaluetypes.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/quick/util/qquickvaluetypes.cpp b/src/quick/util/qquickvaluetypes.cpp index 5af2480b7d..db7a24e140 100644 --- a/src/quick/util/qquickvaluetypes.cpp +++ b/src/quick/util/qquickvaluetypes.cpp @@ -1049,7 +1049,7 @@ void QQuickFontValueType::setPreferShaping(bool enable) void QQuickFontValueType::setFeatures(const QVariantMap &features) { - QHash ff; + v.clearFeatures(); for (auto it = features.constBegin(); it != features.constEnd(); ++it) { QString featureName = it.key(); quint32 tag = QFont::stringToTag(featureName.toUtf8()); @@ -1065,20 +1065,17 @@ void QQuickFontValueType::setFeatures(const QVariantMap &features) continue; } - ff.insert(tag, value); + v.setFeature(tag, value); } - - v.setFeatures(ff); } QVariantMap QQuickFontValueType::features() const { - const QHash ff = v.features(); QVariantMap ret; - for (auto it = ff.constBegin(); it != ff.constEnd(); ++it) { - QString featureName = QString::fromUtf8(QFont::tagToString(it.key())); + for (quint32 tag : v.featureTags()) { + QString featureName = QString::fromUtf8(QFont::tagToString(tag)); - ret.insert(featureName, it.value()); + ret.insert(featureName, v.featureValue(tag)); } return ret; -- cgit v1.2.3