diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2017-12-04 16:37:46 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-01-19 13:57:25 +0000 |
commit | 1d2e3a545278884781234edbfa19a4e3d38815dd (patch) | |
tree | c4230687448d8f15b450ba04759acce3242ba34d /tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp | |
parent | 0f9f716f36c72aa4df7fdcc56f7c19fa823acb85 (diff) |
Don't try (Any,Any,Any) before a partially-specified locale
We unconditionally tried Any-ing out various tags of a locale without
checking the remainer weren't Any, which would get us the C locale in
some cases where we might have done better. So check some retained
tag isn't Any before Any-ing out any tag.
In the process, add a separate variable for the ID with likely tags
filled in, to distinguish it from the supplied localeId (thereby
somewhat clarifying what's afoot) and save duplicating the
construction of this.
Task-number: QTBUG-64940
Change-Id: Ibd9f1aba6862434cf00fbf77ba00288ac9a50a3b
Reviewed-by: Jason Erb (Suitable Technologies) <erb@suitabletech.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp')
0 files changed, 0 insertions, 0 deletions