Skip to content

Commit

Permalink
Revert "tst_qgraphicswidget expect fail on Win 10"
Browse files Browse the repository at this point in the history
This reverts commit 3d5bf00.

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 de6d6eb)
Change-Id: I8b0e61ca4c3711d818508cb1094a57272d9ac11f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
  • Loading branch information
Joni Jäntti committed Aug 30, 2017
1 parent fd6c0a2 commit b875e97
Showing 1 changed file with 0 additions and 7 deletions.
Expand Up @@ -46,7 +46,6 @@
#include <qcommonstyle.h>
#include <qstylefactory.h>
#include <qscreen.h>
#include <QSysInfo>

#include "../../../qtest-config.h"

Expand Down Expand Up @@ -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<QWidget *>(&view));
QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w));
}


void tst_QGraphicsWidget::sizeHint_data()
{
QTest::addColumn<bool>("layout");
Expand Down

0 comments on commit b875e97

Please sign in to comment.