1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update QTimeZone data to CLDR v43

Browse Source 
Ran the script, no new IDs to add. Revised tests of Central Standard
Time: America/Ojinaga has joined Matamoros for it, in Mexico.

Pick-to: 6.6 6.5
Fixes: QTBUG-115732
Task-number: QTBUG-111550
Change-Id: I9b41d8c0156b9fbe3961dbe9a35d55493fc55501
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>
This commit is contained in:
Edward Welbourne 2023-07-27 19:31:02 +02:00
parent 4eb1275062
commit c84d78d105
2 changed files with 796 additions and 795 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1585
src/corelib/time/qtimezoneprivate_data_p.h
View File

File diff suppressed because it is too large Load Diff

6
tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
View File

@ -954,8 +954,8 @@ void tst_QTimeZone::windowsId()
list << "America/Chicago" << "America/Indiana/Knox" << "America/Indiana/Tell_City" list << "America/Chicago" << "America/Indiana/Knox" << "America/Indiana/Tell_City"
<< "America/Matamoros" << "America/Menominee" << "America/North_Dakota/Beulah" << "America/Matamoros" << "America/Menominee" << "America/North_Dakota/Beulah"
<< "America/North_Dakota/Center" << "America/North_Dakota/New_Salem" << "America/North_Dakota/Center" << "America/North_Dakota/New_Salem"
<< "America/Rainy_River" << "America/Rankin_Inlet" << "America/Resolute" << "America/Ojinaga" << "America/Rainy_River" << "America/Rankin_Inlet"
<< "America/Winnipeg" << "CST6CDT"; << "America/Resolute" << "America/Winnipeg" << "CST6CDT";
QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time"), list); QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time"), list);
// Check country with no match returns empty list // Check country with no match returns empty list
@ -970,7 +970,7 @@ void tst_QTimeZone::windowsId()
QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time", QLocale::Canada), list); QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time", QLocale::Canada), list);
list.clear(); list.clear();
list << "America/Matamoros"; list << "America/Matamoros" << "America/Ojinaga";
QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time", QLocale::Mexico), list); QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time", QLocale::Mexico), list);
list.clear(); list.clear();