diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:27 +0200 |
| commit | dd0cd711708f65c429f807f42456bff14404f9c0 (patch) | |
| tree | 14687b4d9bb0b0d2a3b0b8ad6143fa2585a7597f /src/corelib/text/qlocale.h | |
| parent | ed48391c592e8ba68c723e3017ac384f0c7a7c23 (diff) | |
| parent | 86e74d60d2ab66a142a3ed02aabcadaab53b94ed (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/corelib/text/qlocale.h')
| -rw-r--r-- | src/corelib/text/qlocale.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h index 87966b266b..8b73eb5493 100644 --- a/src/corelib/text/qlocale.h +++ b/src/corelib/text/qlocale.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2018 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. @@ -443,6 +443,9 @@ public: WesternBalochi = 364, Cebuano = 365, Erzya = 366, + Chickasaw = 367, + Muscogee = 368, + Silesian = 369, Afan = Oromo, Bhutani = Dzongkha, @@ -459,7 +462,7 @@ public: Twi = Akan, Uigur = Uighur, - LastLanguage = Erzya + LastLanguage = Silesian }; enum Script { |