AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "tst_qgraphicswidget expect fail on Win 10"

Browse Source 
This reverts commit 3d5bf00f18.

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>
This commit is contained in:
Joni Jäntti 2017-08-29 14:37:54 +03:00
parent c827afa282
commit de6d6eb13e
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
View File

@ -41,7 +41,6 @@
#include <qcommonstyle.h> #include <qcommonstyle.h>
#include <qstylefactory.h> #include <qstylefactory.h>
#include <qscreen.h> #include <qscreen.h>
#include <QSysInfo>
typedef QList<QGraphicsItem *> QGraphicsItemList; typedef QList<QGraphicsItem *> QGraphicsItemList;
@ -1776,17 +1775,11 @@ void tst_QGraphicsWidget::updateFocusChainWhenChildDie()
QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, center); QTest::mouseClick(view.viewport(), Qt::LeftButton, 0, center);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
QEXPECT_FAIL("", "QTBUG-23699", Continue); 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 #endif
QTRY_COMPARE(qApp->activeWindow(), static_cast<QWidget *>(&view)); QTRY_COMPARE(qApp->activeWindow(), static_cast<QWidget *>(&view));
QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w)); QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w));
} }
void tst_QGraphicsWidget::sizeHint_data() void tst_QGraphicsWidget::sizeHint_data()
{ {
QTest::addColumn<bool>("layout"); QTest::addColumn<bool>("layout");