From e3bbfe00d1f71ba21889eec438e9438c0ee35c0a Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 11 May 2012 11:34:28 +0200 Subject: Windows: Compress Window Activation events. If the next active window is already known at the time a focus out is received, pass it to QWindowSystemInterface. Fixes a test and Qt Creator's locator bar. Task-number: QTBUG-24186 Task-number: QTCREATORBUG-1 Change-Id: I0aed4c386c08ed182555c95640e1637c5b67f5ce Reviewed-by: Miikka Heikkinen Reviewed-by: Friedemann Kleint --- tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'tests') diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp index 29b65d1fd4..c0242d95c5 100644 --- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp +++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp @@ -116,9 +116,6 @@ void tst_QGuiApplication::focusObject() QTest::qWaitForWindowShown(&window2); QTRY_COMPARE(app.focusWindow(), &window2); QCOMPARE(app.focusObject(), &obj3); -#ifdef Q_OS_WIN - QEXPECT_FAIL("", "QTBUG-24186", Abort); -#endif QCOMPARE(spy.count(), 1); // focus change on unfocused window does not show @@ -241,9 +238,6 @@ void tst_QGuiApplication::changeFocusWindow() window2.requestActivateWindow(); QTRY_COMPARE(app.focusWindow(), &window2); QCOMPARE(window1.windowDuringFocusAboutToChange, &window1); -#ifdef Q_OS_WIN - QEXPECT_FAIL("", "QTBUG-24186", Abort); -#endif QCOMPARE(window1.windowDuringFocusOut, &window2); } -- cgit v1.2.3