Adapt to changes in QFont::features APIv6.6.0-beta2

This API was changed after review, so we need to adapt.

Change-Id: I13c52e3a4cb7ce2b5a50ec5af9a12bdd00da8775
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit d623bba84abd4652db0ab5955170e0556e3b3ca0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files 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<quint32, quint32> 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<quint32, quint32> 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;