From b875e97ad54637cfeb3e5f3e1d70814f62692036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 29 Aug 2017 14:37:54 +0300 Subject: Revert "tst_qgraphicswidget expect fail on Win 10" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3d5bf00f18b5b9d1f5de4ff610ad15d5d0ed8c3d. This change needs to be reverted because Windows 10 Creator's Update doesn't fail on this test anymore during CI runs. Reason for this is unknown. (cherry picked from commit de6d6eb13ebfeefc6e628cc46d695d7693d364ec) Change-Id: I8b0e61ca4c3711d818508cb1094a57272d9ac11f Reviewed-by: Tony Sarajärvi --- .../widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index a88df8a5f5..ec2203e615 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -46,7 +46,6 @@ #include #include #include -#include #include "../../../qtest-config.h" @@ -1809,17 +1808,11 @@ void tst_QGraphicsWidget::updateFocusChainWhenChildDie() QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, center); #ifdef Q_OS_MAC QEXPECT_FAIL("", "QTBUG-23699", Continue); -#endif -#ifdef Q_OS_WIN - if (QSysInfo::kernelVersion() == "10.0.15063") { - QEXPECT_FAIL("", "This fails on Windows 10 Creators Update (10.0.15063)", Continue); - } #endif QTRY_COMPARE(qApp->activeWindow(), static_cast(&view)); QTRY_COMPARE(scene.focusItem(), static_cast(w)); } - void tst_QGraphicsWidget::sizeHint_data() { QTest::addColumn("layout"); -- cgit v1.2.3