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

Correct an earlier pick

Browse Source 
Amends commit 52909797accd850126802dcc66d00327eb1e50a5, whose conflict
resolutions inadvertently incorporated the movement of IANA IDs from
the list table to the IANA table, a change only done on dev (6.9), not
picked back to 6.8, but tagged with a # TODO comment in 6.8 that, none
the less, is not to be done in 6.8.

Restore writing to the correct table.

Change-Id: I70fd133eb54526efecae189306b3ae07c1c638db
Reviewed-by: Mate Barany <mate.barany@qt.io>
This commit is contained in:
Edward Welbourne 2024-11-01 17:01:30 +01:00
parent b63615ca6c
commit cff042eb53
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/locale_database/qlocalexml2cpp.py
View File

@ -223,7 +223,7 @@ class TimeZoneDataWriter (LocaleSourceEditor):
def msToIana(self, pairs: Iterator[tuple[str, str]]) -> None:
out: Callable[[str], int] = self.writer.write
winStore: Callable[[str], int] = self.__windowsTable.append
ianaStore: Callable[[str], int] = self.__ianaTable.append
ianaStore: Callable[[str], int] = self.__ianaListTable.append
alias: dict[str, str] = dict(pairs) # {MS name: IANA ID}
out('// Windows ID Key, Windows ID Index, IANA ID Index, UTC Offset\n')