diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-05 19:06:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-05 19:06:47 +0100 |
| commit | eedb3a06cbaff1a3e100a0d68a578d15a0c9dd97 (patch) | |
| tree | cc9c2677b63d99f87dfd60d7eb0aba138c026d06 /src/corelib/tools/qlocale.qdoc | |
| parent | 73e7eb785fbf984e2b964be8c3acad788479dfa6 (diff) | |
| parent | d24835a60c0c620a27c7a9830b89ed47312739a5 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I12f26470e01a8582d0f02f51e20d5b742bd95d6f
Diffstat (limited to 'src/corelib/tools/qlocale.qdoc')
| -rw-r--r-- | src/corelib/tools/qlocale.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc index 5c0a9b63e5..76ca909d83 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 v33.1. + QLocale's data is based on Common Locale Data Repository v34. \sa QString::arg(), QString::toInt(), QString::toDouble(), QInputMethod::locale() |