path: root/dist
diff options
authorEdward Welbourne <>2018-09-03 14:05:55 +0200
committerEdward Welbourne <>2019-11-25 08:50:27 +0100
commit2bf6a94cf60aa53f8a18f71dd4dce047c52dfc64 (patch)
tree61fbd70babe708c6776e863beb948f9de9adb7d8 /dist
parent2ed7831ff636f4fbaec27524d416d63c2fd773bf (diff)
Clean up time-zone matching logic in tst_QLocale::macDefaultLocale()
The test was computing GMT with a suffix added to it for the offset; but when the offset is zero there's no need for it. Cleaned up the logic so that it only checks for a "padded to two digits with zero" if the number is single-digit (and use string arithmetic in preference to wantonly complex .arg()ing; and use simpler names). Since we don't try to check anything unless GMT does appear in the string (because the actual zone ID was used, instead of GMT with an offset), the case of zero offset has nothing more to check than that GMT was present, the precondition for checking anything. Fixes: QTBUG-79965 Task-number: QTBUG-70322 Change-Id: I0b8abe7e63d9d72fa9cf32f188b47a78a849044b Reviewed-by: Qt CI Bot <> Reviewed-by: Thiago Macieira <> (cherry picked from commit 017ac02ec459378074a44487f171cc909e947f4a) Reviewed-by: Heikki Halmet <> Reviewed-by: Frederik Gladhorn <>
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions