summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2019-01-28 14:40:44 +0100
committerKai Koehne <kai.koehne@qt.io>2019-01-28 15:02:52 +0000
commit112278d3d719ebb3ade00a8e63eb16abd4a29550 (patch)
treea4474636b5f8abe95d49ccfea5dc158725e502c9 /tests
parent9bbeb7e6e8fb0fdd743b741dce61543fc4246ee2 (diff)
Avoid test failures in tst_qtimezone.cpp and Windows 10 1809
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 <edward.welbourne@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp
index d335dae7bc..a25fd39693 100644
--- a/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp
+++ b/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp
@@ -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