diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 01:01:01 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-01 01:01:02 +0100 |
| commit | 4b0af2cdbf61572b22ea6b8aa17fc9f52c71ac4b (patch) | |
| tree | 60fb25a6772f5ac2d26af005b9888ff09c08a6c1 /src/corelib/text/qchar.h | |
| parent | cff492fed1d98f45c4c1f4011f1451120c0d1c23 (diff) | |
| parent | 36e277e91732d6d75fb6d9cb691fe9c0f83f6178 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I68a6ed3184e62fa89c47c564bb01002c0918d0fd
Diffstat (limited to 'src/corelib/text/qchar.h')
| -rw-r--r-- | src/corelib/text/qchar.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/corelib/text/qchar.h b/src/corelib/text/qchar.h index f67a7ea90a..85a380e7cf 100644 --- a/src/corelib/text/qchar.h +++ b/src/corelib/text/qchar.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -328,6 +328,19 @@ public: Script_Soyombo, Script_ZanabazarSquare, + // Unicode 12.1 additions + Script_Dogra, + Script_GunjalaGondi, + Script_HanifiRohingya, + Script_Makasar, + Script_Medefaidrin, + Script_OldSogdian, + Script_Sogdian, + Script_Elymaic, + Script_Nandinagari, + Script_NyiakengPuachueHmong, + Script_Wancho, + ScriptCount }; @@ -421,7 +434,10 @@ public: Unicode_7_0, Unicode_8_0, Unicode_9_0, - Unicode_10_0 + Unicode_10_0, + Unicode_11_0, + Unicode_12_0, + Unicode_12_1, }; // ****** WHEN ADDING FUNCTIONS, CONSIDER ADDING TO QCharRef TOO |