summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoni Jäntti <joni.jantti@qt.io>2017-08-30 15:45:44 +0300
committerTony Sarajärvi <tony.sarajarvi@qt.io>2017-08-31 07:25:02 +0000
commit40ca27e0d2107fd97b01bfb201cff408f7c5a0c3 (patch)
tree2cf863a92980cfc1ce2fd290a315a3301f90b3ec
parentb875e97ad54637cfeb3e5f3e1d70814f62692036 (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> (cherry picked from commit e938150412d22e61926fe16791158805b71268bb) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r--tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp6
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 396748951b..cc1aaa7d51 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -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