diff options
| author | Joni Jäntti <joni.jantti@qt.io> | 2017-08-30 15:45:44 +0300 |
|---|---|---|
| committer | Joni Jäntti <joni.jantti@qt.io> | 2017-08-30 12:49:02 +0000 |
| commit | e938150412d22e61926fe16791158805b71268bb (patch) | |
| tree | 6e15c426abeee33ff2794b21968f57aa0f0db6b3 /tests/auto/widgets | |
| parent | b7722c251c3a0938c7c71fc3da47fdbe920060b7 (diff) | |
Revert "tst_qwidget::activation expect fail on Win 10"
This reverts commit 85612817685f8b64307276a2ce9ef79d9e048be4.
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>
Diffstat (limited to 'tests/auto/widgets')
| -rw-r--r-- | tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index ef851f38b2..63ff8380f8 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -1774,12 +1774,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 |