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-30 06:53:19 +0000 |
| commit | b875e97ad54637cfeb3e5f3e1d70814f62692036 (patch) | |
| tree | 1942e744804befd4f315e2f08e79aed8d184d74d | |
| parent | fd6c0a29040e60c6596c1fd19c06eb04d38043bb (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.
(cherry picked from commit de6d6eb13ebfeefc6e628cc46d695d7693d364ec)
Change-Id: I8b0e61ca4c3711d818508cb1094a57272d9ac11f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| -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 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 <qcommonstyle.h> #include <qstylefactory.h> #include <qscreen.h> -#include <QSysInfo> #include "../../../qtest-config.h" @@ -1810,16 +1809,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"); |