diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2018-06-15 11:35:00 +0200 |
---|---|---|
committer | MÃ¥rten Nordheim <marten.nordheim@qt.io> | 2018-06-22 13:06:14 +0000 |
commit | 4fa8dfee5dd31433d22fdb449c1783e256931c8f (patch) | |
tree | 703220d63d2b3bbcafdbf8375167b1ebdd140097 /src/plugins/platforms/xcb | |
parent | 4361c0ee846fb5574a05534186a01779a5e0bb82 (diff) |
Leave m_id clear if the JNI didn't give us a time-zone
QTimeZonePrivate::isValid() just checks m_id is non-empty; so we have
to leave m_id clear if we don't get a valid time-zone back when we ask
the JNI for one. Unfortunately, JNI gives us a "valid" default zone
if it doesn't recognize the given name; so check the known names of
this zone (or of zones with its offset); if the given ianaId isn't one
of them, assume this is a bogus zone.
Task-number: QTBUG-68842
Change-Id: I6245db18c59c4261ed5fcd4d948dd773365ce61d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/plugins/platforms/xcb')
0 files changed, 0 insertions, 0 deletions