diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
| commit | ff922e7b87de147797fbd759167878aec7625f0c (patch) | |
| tree | a326819f23e2421723f144522f9362ba608d6bb1 /src/corelib/text/qchar.cpp | |
| parent | e464e1eb8eb63c631fb0916c3ea4540a88d8aad3 (diff) | |
| parent | 75f52bd0ddc4afbd181c14b310d256e3507052d6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/kernel/qmetatype.cpp
Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a
Diffstat (limited to 'src/corelib/text/qchar.cpp')
| -rw-r--r-- | src/corelib/text/qchar.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/text/qchar.cpp b/src/corelib/text/qchar.cpp index 61b61125b12..4a7af8971fa 100644 --- a/src/corelib/text/qchar.cpp +++ b/src/corelib/text/qchar.cpp @@ -192,6 +192,7 @@ QT_BEGIN_NAMESPACE \value Unicode_11_0 Version 11.0 Since Qt 5.15 \value Unicode_12_0 Version 12.0 Since Qt 5.15 \value Unicode_12_1 Version 12.1 Since Qt 5.15 + \value Unicode_13_0 Version 13.0 Since Qt 5.15 \value Unicode_Unassigned The value is not assigned to any character in version 8.0 of Unicode. @@ -314,12 +315,14 @@ QT_BEGIN_NAMESPACE \value Script_Chakma \value Script_Cham \value Script_Cherokee + \value Script_Chorasmian Since Qt 5.15 \value Script_Coptic \value Script_Cuneiform \value Script_Cypriot \value Script_Cyrillic \value Script_Deseret \value Script_Devanagari + \value Script_DivesAkuru Since Qt 5.15 \value Script_Dogra Since Qt 5.15 \value Script_Duployan Since Qt 5.5 \value Script_EgyptianHieroglyphs @@ -350,6 +353,7 @@ QT_BEGIN_NAMESPACE \value Script_Katakana \value Script_KayahLi \value Script_Kharoshthi + \value Script_KhitanSmallScript Since Qt 5.15 \value Script_Khmer \value Script_Khojki Since Qt 5.5 \value Script_Khudawadi Since Qt 5.5 @@ -439,6 +443,7 @@ QT_BEGIN_NAMESPACE \value Script_Vai \value Script_Wancho Since Qt 5.15 \value Script_WarangCiti Since Qt 5.5 + \value Script_Yezidi Since Qt 5.15 \value Script_Yi \value Script_ZanabazarSquare Since Qt 5.11 |