diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp index 5bf39b3953..2e2945ee5d 100644 --- a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp +++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp @@ -36,6 +36,7 @@ #include #include #include +#include QT_FORWARD_DECLARE_CLASS(QWidget) @@ -329,6 +330,14 @@ void tst_QFocusEvent::checkReason_ActiveWindow() QTRY_VERIFY(childFocusWidgetOne->focusOutEventRecieved); QVERIFY(childFocusWidgetOne->focusOutEventLostFocus); +#if defined(Q_OS_WIN) + if (QSysInfo::kernelVersion() == "10.0.15063") { + // Activate window of testFocusWidget, focus in that window goes to childFocusWidgetOne + QWARN("Windows 10 Creators Update (10.0.15063) requires explicit activateWindow()"); + testFocusWidget->activateWindow(); + } +#endif + QVERIFY( !childFocusWidgetOne->focusInEventRecieved ); QVERIFY( childFocusWidgetOne->focusOutEventRecieved ); QCOMPARE( childFocusWidgetOne->focusOutEventReason, (int)Qt::ActiveWindowFocusReason);