diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2023-07-27 19:31:02 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2023-08-07 19:51:09 +0200 |
| commit | c84d78d105a3d3a413ca61db911352bbf695e370 (patch) | |
| tree | 0e0350e853ee2caa1253e60ee597993f2d3e5579 /tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp | |
| parent | 4eb127506277d1db02a34f3d73d906e32a749819 (diff) | |
Update QTimeZone data to CLDR v43
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>
Diffstat (limited to 'tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp')
| -rw-r--r-- | tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp index e87cc97429..54954a8a38 100644 --- a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp +++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp @@ -954,8 +954,8 @@ void tst_QTimeZone::windowsId() list << "America/Chicago" << "America/Indiana/Knox" << "America/Indiana/Tell_City" << "America/Matamoros" << "America/Menominee" << "America/North_Dakota/Beulah" << "America/North_Dakota/Center" << "America/North_Dakota/New_Salem" - << "America/Rainy_River" << "America/Rankin_Inlet" << "America/Resolute" - << "America/Winnipeg" << "CST6CDT"; + << "America/Ojinaga" << "America/Rainy_River" << "America/Rankin_Inlet" + << "America/Resolute" << "America/Winnipeg" << "CST6CDT"; QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time"), 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); list.clear(); - list << "America/Matamoros"; + list << "America/Matamoros" << "America/Ojinaga"; QCOMPARE(QTimeZone::windowsIdToIanaIds("Central Standard Time", QLocale::Mexico), list); list.clear(); |