diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-10-20 13:58:42 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-10-29 10:44:38 +0000 |
commit | 3a1bc4bad5757d72e5af8b4abe236e3cfac9621d (patch) | |
tree | 71af1c9180ed7e40df8a9975e83c519bda3d1e7d /tests/auto | |
parent | 60d804c56769de82e658205bec687b83833a61e9 (diff) |
Purge deprecated language and country codes from QLocale
Requires subsequent re-numbering of the enum tables to eliminate gaps,
before locale data can be regenerated. However, it will work with the
present locale data, since it merely loses the means to use some names
for which the available data was just the name and code. This implies
a transient issue of recognising some codes for which there is no
actual enum member; but relevant code will work as before, finding
nothing but the code and its name. This shall be resolved by a coming
BiC change to resort the language, country and script codes, changing
the numbering (almost) completely.
[ChangeLog][QtCore][QLocale] Various obsolete language and country
codes have been removed. Some lacked locale data, others were obsolete
aliases. All have been deprecated in 5.15.
Task-number: QTBUG-84669
Change-Id: I45fc76a5f2f6c3b0ea3c1bb61e917da984183783
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp index 8d0d53e8f0..28aec34af1 100644 --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp @@ -646,22 +646,6 @@ void tst_QLocale::legacyNames() { QLocale::setDefault(QLocale(QLocale::C)); -#if QT_DEPRECATED_SINCE(5, 15) -#define TEST_CTOR(req_lang, req_country, exp_lang, exp_country) \ - { \ - QLocale l(QLocale::req_lang, QLocale::req_country); \ - QCOMPARE((int)l.language(), (int)QLocale::exp_lang); \ - QCOMPARE((int)l.country(), (int)QLocale::exp_country); \ - } - - TEST_CTOR(Moldavian, Moldova, Romanian, Moldova) - TEST_CTOR(Norwegian, AnyCountry, Norwegian, Norway) - TEST_CTOR(SerboCroatian, Montenegro, Serbian, Montenegro) - TEST_CTOR(Tagalog, AnyCountry, Filipino, Philippines) - -#undef TEST_CTOR -#endif - #define TEST_CTOR(req_lc, exp_lang, exp_country) \ { \ QLocale l(req_lc); \ @@ -2869,18 +2853,6 @@ void tst_QLocale::textDirection_data() bool rightToLeft = false; switch (language) { // based on likelySubtags for RTL scripts -#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: |