From 112278d3d719ebb3ade00a8e63eb16abd4a29550 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 28 Jan 2019 14:40:44 +0100 Subject: 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 --- tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests') 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 -- cgit v1.2.3