Skip to content

Commit

Permalink
Revert "tst_qwidget::activation expect fail on Win 10"
Browse files Browse the repository at this point in the history
This reverts commit 8561281.

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: Ice250ecedb14ac96fb3693b2d9884ef452a91cc2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit e938150)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
  • Loading branch information
Joni Jäntti authored and Tony Sarajärvi committed Aug 31, 2017
1 parent b875e97 commit 40ca27e
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Expand Up @@ -1869,12 +1869,6 @@ void tst_QWidget::activation()
QCOMPARE(QApplication::activeWindow(), &widget2);
widget2.hide();
QTest::qWait(waitTime);
#ifdef Q_OS_WIN
if (QSysInfo::kernelVersion() == "10.0.15063") {
QEXPECT_FAIL("", "This fails on Windows 10 Creators Update (10.0.15063)", Continue);
// This happens in automated Windows 10 Creators Update (10.0.15063) CI builds!
}
#endif
QCOMPARE(QApplication::activeWindow(), &widget1);
}
#endif // Q_OS_WIN
Expand Down

0 comments on commit 40ca27e

Please sign in to comment.