diff options
| author | Joni Jäntti <joni.jantti@qt.io> | 2017-08-29 14:37:54 +0300 |
|---|---|---|
| committer | Joni Jäntti <joni.jantti@qt.io> | 2017-08-29 11:59:23 +0000 |
| commit | de6d6eb13ebfeefc6e628cc46d695d7693d364ec (patch) | |
| tree | c6b203ad64cd7db4bcd5b1a90c0d0b8413f1ddca /tests/auto/widgets | |
| parent | c827afa2820e539179c5d11ca073e4d90e98df5d (diff) | |
Revert "tst_qgraphicswidget expect fail on Win 10"
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.
Change-Id: I9f1c88606c97afc5952af34e04310612b783a9c2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'tests/auto/widgets')
| -rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index 5e3cb66aae..1be17b552e 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -41,7 +41,6 @@ #include <qcommonstyle.h> #include <qstylefactory.h> #include <qscreen.h> -#include <QSysInfo> typedef QList<QGraphicsItem *> QGraphicsItemList; @@ -1777,16 +1776,10 @@ void tst_QGraphicsWidget::updateFocusChainWhenChildDie() #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<QWidget *>(&view)); QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w)); } - void tst_QGraphicsWidget::sizeHint_data() { QTest::addColumn<bool>("layout"); |