summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/text
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-10-20 11:18:14 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-10-28 06:25:47 +0100
commit2575a8ced39b607ed320ed230c83119eaad4b33b (patch)
tree7b8827f9a18f603caa74285476e04210941a7e8a /tests/auto/corelib/text
parent3857f104cac127f62e64e55a20613f0ac2e6b843 (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 Pick-to: 5.15 5.15.2 Change-Id: I2bf2d49211ade7cc511277f35fb1a247e7048b31 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/corelib/text')
-rw-r--r--tests/auto/corelib/text/qlocale/tst_qlocale.cpp22
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 b488104c69..87e526cba3 100644
--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
@@ -2869,13 +2869,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:
@@ -2883,23 +2893,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: