summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-02-12 11:01:51 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2020-04-16 13:52:11 +0200
commitb34158d7a1e89e5e7b32d3425c3df52aacedbb31 (patch)
treeb9fa377b4c62b223f0bd35106df6de0610974cfe /src/dbus
parent8138c812cbd65233a61d6e2e2f783d060c02de60 (diff)
Fix display-name calls in QAndroidTimeZonePrivate::init()
Following up on commits 4fa8dfee5dd31433d22fdb449c1783e256931c8f and c20c7efea96046bebcb8ff7823d3a7e227f92e73, where I apparently got the call to Java's getDisplayName() method wrong. Use the same code as our own displayName() method used for this, pulled out as a function to be shared by the two callers. This requires a locale and it's not immediately obvious which to use, so try the three most plausible candidates: C locale because IANA IDs are typically in it; default because that's most likely what language a user-supplied locale name might be in; and system because the name may have come from the system, not the user. In the process fixed some loops that didn't visit all the values they thought they did. Fixes: QTBUG-81975 Change-Id: I7867ca6f46951315a41c389107439acb439eaf08 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/dbus')
0 files changed, 0 insertions, 0 deletions