diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-05-11 11:34:28 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-11 15:11:20 +0200 |
commit | e3bbfe00d1f71ba21889eec438e9438c0ee35c0a (patch) | |
tree | 8ad9ef83a5d8404144256e6851ef064e2dd4282e /tests/auto/gui | |
parent | 0909c01b2f5d3a466fe6094a501a2893170e2616 (diff) |
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 <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/gui')
-rw-r--r-- | tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
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); } |