diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-10-20 11:41:13 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-10-28 06:26:01 +0100 |
| commit | 2c4874be40aa40b698315cac0ad768e5c650a740 (patch) | |
| tree | b3d3836372f7a76e8133d9b0f3153c61f604f07e /src/corelib/text/qlocale.qdoc | |
| parent | 2575a8ced39b607ed320ed230c83119eaad4b33b (diff) | |
Deprecate old aliases for two countries and several languages
[ChangeLog][QtCore][QLocale] Deprecated several Language and Country
aliases, ready for removal in Qt 6.0, in favor of their newer names.
Task-number: QTBUG-84669
Pick-to: 5.15 5.15.2
Change-Id: Iebaa0a5a77bfa12f7014de53fab4a25b5f1cc92c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/text/qlocale.qdoc')
| -rw-r--r-- | src/corelib/text/qlocale.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/text/qlocale.qdoc b/src/corelib/text/qlocale.qdoc index f366cdb584..9bf2131150 100644 --- a/src/corelib/text/qlocale.qdoc +++ b/src/corelib/text/qlocale.qdoc @@ -349,9 +349,9 @@ \value NorthernSotho \value NorthernThai Obsolete, no locale data available \value NorthNdebele - \value NorwegianBokmal same as Norwegian + \value NorwegianBokmal \value NorwegianNynorsk - \value Norwegian same as NorwegianBokmal + \value Norwegian Obsolete, please use NorwegianBokmal \value Nuer \value Nyanja \value Nyankole |