diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-05-14 12:59:42 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-05-15 18:46:39 +0200 |
| commit | 794150e5bda0c203a5373c3fa2f9785f9941f6dd (patch) | |
| tree | 2588b9ad3e3034ac9ee8a03a75d26c23223402cd /src/corelib/kernel | |
| parent | 45cf8da63c419c27e7476f0a929e9d8ba664bfd3 (diff) | |
QMetaType: Support char16_t and char32_t
Change-Id: Ieec6d4bc64967d875ea12b31638aab05bc682ea3
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 96133c13c5..05fe4450df 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -85,6 +85,8 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId(); F(Long, 32, long) \ F(Short, 33, short) \ F(Char, 34, char) \ + F(Char16, 56, char16_t) \ + F(Char32, 57, char32_t) \ F(ULong, 35, ulong) \ F(UShort, 36, ushort) \ F(UChar, 37, uchar) \ @@ -451,7 +453,7 @@ public: QT_FOR_EACH_STATIC_TYPE(QT_DEFINE_METATYPE_ID) FirstCoreType = Bool, - LastCoreType = QCborMap, + LastCoreType = Char32, FirstGuiType = QFont, LastGuiType = QColorSpace, FirstWidgetsType = QSizePolicy, @@ -482,6 +484,7 @@ public: Nullptr = 51, QVariantMap = 8, QVariantList = 9, QVariantHash = 28, QCborSimpleType = 52, QCborValue = 53, QCborArray = 54, QCborMap = 55, + Char16 = 56, Char32 = 57, // Gui types QFont = 64, QPixmap = 65, QBrush = 66, QColor = 67, QPalette = 68, |