Skip to content

Commit

Permalink
Avoid test failures in tst_qtimezone.cpp and Windows 10 1809
Browse files Browse the repository at this point in the history
The test started to fail now also for latest Windows 10 Update
Restone 2. It's unclear why the test was succeeding before, since this
seems a generic Windows API issue.

Task-number: QTBUG-64985
Task-number: QTQAINFRA-2255
Change-Id: I804f6a61c63ea70157353d1aee9027d0735073ab
Reviewed-by: Edward Welbourne <[email protected]>
  • Loading branch information
kkoehne committed Jan 28, 2019
1 parent 9bbeb7e commit 112278d
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,7 @@ void tst_QTimeZone::transitionEachZone()
#ifdef USING_WIN_TZ
// See QTBUG-64985: MS's TZ APIs' misdescription of Europe/Samara leads
// to mis-disambiguation of its fall-back here.
if (QOperatingSystemVersion::current() <= QOperatingSystemVersion::Windows7
&& zone == "Europe/Samara" && i == -3) {
if (zone == "Europe/Samara" && i == -3) {
continue;
}
#endif
Expand Down

0 comments on commit 112278d

Please sign in to comment.