1 files changed, 76 insertions, 2 deletions

diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h
index 7fb591b51d..66a5f7c155 100644
--- a/src/gui/text/qfont.h
+++ b/src/gui/text/qfont.h
@@ -4,10 +4,12 @@
 #ifndef QFONT_H
 #define QFONT_H
 
+#include <QtCore/qcompare.h>
+#include <QtCore/qendian.h>
+#include <QtCore/qshareddata.h>
 #include <QtGui/qtguiglobal.h>
 #include <QtGui/qwindowdefs.h>
 #include <QtCore/qstring.h>
-#include <QtCore/qsharedpointer.h>
 
 
 QT_BEGIN_NAMESPACE
@@ -45,6 +47,7 @@ public:
         NoAntialias         = 0x0100,
         NoSubpixelAntialias = 0x0800,
         PreferNoShaping     = 0x1000,
+        ContextFontMerging  = 0x2000,
         NoFontMerging       = 0x8000
     };
     Q_ENUM(StyleStrategy)
@@ -126,7 +129,9 @@ public:
         HintingPreferenceResolved   = 0x8000,
         StyleNameResolved           = 0x10000,
         FamiliesResolved            = 0x20000,
-        AllPropertiesResolved       = 0x3ffff
+        FeaturesResolved            = 0x40000,
+        VariableAxesResolved        = 0x80000,
+        AllPropertiesResolved       = 0xfffff
     };
     Q_ENUM(ResolveProperties)
 
@@ -206,6 +211,75 @@ public:
     void setHintingPreference(HintingPreference hintingPreference);
     HintingPreference hintingPreference() const;
 
+    struct Tag
+    {
+        constexpr Tag() = default;
+
+        template <size_t N>
+        constexpr Q_IMPLICIT Tag(const char (&str)[N]) noexcept
+            :  m_value((quint32(str[0]) << 24) | (quint32(str[1]) << 16)
+                     | (quint32(str[2]) << 8) | quint32(str[3]))
+        {
+            static_assert(N == 5, "The tag name must be exactly 4 characters long!");
+        }
+
+        constexpr bool isValid() const noexcept { return m_value != 0; }
+        constexpr quint32 value() const noexcept { return m_value; }
+
+        QByteArray toString() const
+        {
+            const char data[] = {
+                char((m_value & 0xff000000) >> 24),
+                char((m_value & 0x00ff0000) >> 16),
+                char((m_value & 0x0000ff00) >> 8),
+                char((m_value & 0x000000ff)) };
+            return QByteArray(data, sizeof(data));
+        }
+
+        static constexpr std::optional<Tag> fromValue(quint32 value) noexcept
+        {
+            Tag maybeTag;
+            maybeTag.m_value = value;
+            return maybeTag.isValid() ? std::optional<Tag>(maybeTag) : std::nullopt;
+        }
+        Q_GUI_EXPORT static std::optional<Tag> fromString(QAnyStringView view) noexcept;
+
+#ifndef QT_NO_DATASTREAM
+        friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, Tag);
+        friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, Tag &);
+#endif
+
+#ifndef QT_NO_DEBUG_STREAM
+        friend Q_GUI_EXPORT QDebug operator<<(QDebug debug, Tag tag);
+#endif
+
+        friend constexpr size_t qHash(Tag key, size_t seed = 0) noexcept
+        { return qHash(key.value(), seed); }
+
+    private:
+        friend constexpr bool comparesEqual(const Tag &lhs, const Tag &rhs) noexcept
+        { return lhs.m_value == rhs.m_value; }
+        friend constexpr Qt::strong_ordering compareThreeWay(const Tag &lhs, const Tag &rhs) noexcept
+        { return Qt::compareThreeWay(lhs.m_value, rhs.m_value); }
+        Q_DECLARE_STRONGLY_ORDERED_LITERAL_TYPE(QFont::Tag)
+
+        quint32 m_value = 0;
+    };
+
+    void setFeature(Tag tag, quint32 value);
+    void unsetFeature(Tag tag);
+    quint32 featureValue(Tag tag) const;
+    bool isFeatureSet(Tag tag) const;
+    QList<Tag> featureTags() const;
+    void clearFeatures();
+
+    void setVariableAxis(Tag tag, float value);
+    void unsetVariableAxis(Tag tag);
+    bool isVariableAxisSet(Tag tag) const;
+    float variableAxisValue(Tag tag) const;
+    void clearVariableAxes();
+    QList<Tag> variableAxisTags() const;
+
     // dupicated from QFontInfo
     bool exactMatch() const;