diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-05-28 16:41:49 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:14:42 +0200 |
| commit | e4079eca49adce16e31dac2a18d49d7a55817891 (patch) | |
| tree | 1dfb960ec1115b1f552afe8a013058542389505e /src/corelib/tools/qlocale.qdoc | |
| parent | f32a6cfb6b6236533508901f114ab57396da8ff3 (diff) | |
| parent | ec6dc5f78453048c4f0604655a34c6c20c79d819 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Take 5.
Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3
Diffstat (limited to 'src/corelib/tools/qlocale.qdoc')
| -rw-r--r-- | src/corelib/tools/qlocale.qdoc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc index 91b0ab6442..426cb9dbeb 100644 --- a/src/corelib/tools/qlocale.qdoc +++ b/src/corelib/tools/qlocale.qdoc @@ -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 v34. + QLocale's data is based on Common Locale Data Repository v35.1. \sa QString::arg(), QString::toInt(), QString::toDouble(), QInputMethod::locale() @@ -104,7 +104,7 @@ This enumerated type is used to specify a language. \value AnyLanguage - \value C The "C" locale is identical in behavior to English/UnitedStates. + \value C A simplified English locale; see QLocale::c() \value Abkhazian \value Afan Obsolete, please use Oromo @@ -164,6 +164,7 @@ \value Cantonese Since Qt 5.7 \value Carian Since Qt 5.1 \value Catalan + \value Cebuano Since Qt 5.14 \value CentralKurdish Since Qt 5.5 \value CentralMoroccoTamazight \value Chakma Since Qt 5.1 @@ -194,6 +195,7 @@ \value EasternKayah Since Qt 5.1 \value Embu \value English + \value Erzya Since Qt 5.14 \value Esperanto \value Estonian \value Etruscan Since Qt 5.1 |