diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-10-20 11:18:14 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-10-28 10:43:10 +0000 |
commit | c008da85081642ff4ea5db962b9562630ebd9fe9 (patch) | |
tree | ca43f36f4f403811820b5674da5399b63b236ab4 /tests/auto | |
parent | 28bc3ca8114033a5542e7877105de4f7ec62bf83 (diff) |
Deprecate QLocale::Language entries that no locale data relates to
These are languages for which CLDR does not even recognize the claimed
language code (three-letter codes except for bh = Bihari, which might
be an old name for bho = Bhojpuri, which CLDR does give, but provides
no locale data using it).
[ChangeLog][QtCore][QLocale::Language] Many obsolete language names
are now deprecated in preparation for removal at Qt 6.0. No data has
been available for any locale using these languages since CLDR v29 (at
least; Qt now uses v37).
Task-number: QTBUG-84669
Change-Id: I2bf2d49211ade7cc511277f35fb1a247e7048b31
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 2575a8ced39b607ed320ed230c83119eaad4b33b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp index 62654adc6a..1afbc169a7 100644 --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp @@ -2779,13 +2779,23 @@ void tst_QLocale::textDirection_data() bool rightToLeft = false; switch (language) { // based on likelySubtags for RTL scripts - case QLocale::AncientGreek: +#if QT_DEPRECATED_SINCE(5, 15) case QLocale::AncientNorthArabian: + case QLocale::ClassicalMandaic: + case QLocale::Lydian: + case QLocale::ManichaeanMiddlePersian: + case QLocale::Meroitic: + case QLocale::OldTurkish: + case QLocale::Parthian: + case QLocale::PrakritLanguage: + case QLocale::Sabaean: + case QLocale::Samaritan: +#endif + case QLocale::AncientGreek: case QLocale::Arabic: case QLocale::Aramaic: case QLocale::Avestan: case QLocale::CentralKurdish: - case QLocale::ClassicalMandaic: case QLocale::Divehi: // case QLocale::Fulah: // case QLocale::Hausa: @@ -2793,23 +2803,15 @@ void tst_QLocale::textDirection_data() // case QLocale::Hungarian: case QLocale::Kashmiri: // case QLocale::Kurdish: - case QLocale::Lydian: case QLocale::Mandingo: - case QLocale::ManichaeanMiddlePersian: case QLocale::Mazanderani: case QLocale::Mende: - case QLocale::Meroitic: case QLocale::Nko: case QLocale::NorthernLuri: - case QLocale::OldTurkish: case QLocale::Pahlavi: - case QLocale::Parthian: case QLocale::Pashto: case QLocale::Persian: case QLocale::Phoenician: - case QLocale::PrakritLanguage: - case QLocale::Sabaean: - case QLocale::Samaritan: case QLocale::Sindhi: case QLocale::SouthernKurdish: case QLocale::Syriac: |