diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-27 01:00:50 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-27 01:00:50 +0200 |
commit | 8bcecd86fac60475a7236787b4b89460fa89d612 (patch) | |
tree | 947fc6b3b097c615e7cb2611c2df9f2fabdaac1c /src/corelib/text/qlocale.qdoc | |
parent | 7b3bdcbfe8a920c4c156e91324eb0b374533d42c (diff) | |
parent | dd0cd711708f65c429f807f42456bff14404f9c0 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I182a639748760393f9e6b0724259201588aeaae3
Diffstat (limited to 'src/corelib/text/qlocale.qdoc')
-rw-r--r-- | src/corelib/text/qlocale.qdoc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/text/qlocale.qdoc b/src/corelib/text/qlocale.qdoc index 426cb9dbeb..6c9d6f9d11 100644 --- a/src/corelib/text/qlocale.qdoc +++ b/src/corelib/text/qlocale.qdoc @@ -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 documentation of the Qt Toolkit. @@ -92,7 +92,7 @@ \note For the current keyboard input locale take a look at QInputMethod::locale(). - QLocale's data is based on Common Locale Data Repository v35.1. + QLocale's data is based on Common Locale Data Repository v36. \sa QString::arg(), QString::toInt(), QString::toDouble(), QInputMethod::locale() @@ -172,6 +172,7 @@ \value Chechen \value Cherokee \value Chewa Obsolete, please use Nyanja + \value Chickasaw Since Qt 5.14 \value Chiga \value Chinese \value Church @@ -333,6 +334,7 @@ \value Morisyen \value Mru Since Qt 5.7 \value Mundang + \value Muscogee Since Qt 5.14 \value Nama \value NauruLanguage \value Navaho @@ -406,6 +408,7 @@ \value SichuanYi \value Sicilian Since Qt 5.12 \value Sidamo + \value Silesian Since Qt 5.14 \value Sindhi \value Sinhala \value SkoltSami Since Qt 5.5 |