diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-06-06 09:25:01 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-06 12:07:48 +0200 |
| commit | e8cd9a617d85deebb6407973fd1fb11a6486ee99 (patch) | |
| tree | ddbeae1e1087c43f008f3c5f78b6d2380dde3b22 /tests | |
| parent | 80653bf4ce8d03f4af2fe8cc2f3751d32bd31d75 (diff) | |
Cocoa: do not send multiple window activation events
When switching the active window within the same application, Cocoa
sends us an NSWindowDidResignKeyNotification for the old activated
window, then an NSWindowDidBecomeKeyNotificationfor the newly activated
window. Our handling of this would first set Qt's active window to zero,
then immediately reset it afterwards. Avoid this by checking the key
window when handling the deactivation event, and don't set the active
window to zero if a new window has become active.
Task-number: QTBUG-24322
Change-Id: I8719fc501049eeaaebb75e9ea03261b2209458b6
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp index c0242d95c5..578ea9f693 100644 --- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp +++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp @@ -81,9 +81,6 @@ public: void tst_QGuiApplication::focusObject() { -#ifdef Q_OS_MAC - QSKIP("This test fails intermittently, and at different locations. See QTBUG-24322"); -#endif int argc = 0; QGuiApplication app(argc, 0); |