summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/kernel/qabstracteventdispatcher.cpp7
-rw-r--r--src/gui/kernel/qeventdispatcher_blackberry_qpa.cpp7
2 files changed, 8 insertions, 6 deletions
diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp
index 9ede350..abc362b 100644
--- a/src/corelib/kernel/qabstracteventdispatcher.cpp
+++ b/src/corelib/kernel/qabstracteventdispatcher.cpp
@@ -463,8 +463,8 @@ void QAbstractEventDispatcher::closingDown()
\snippet doc/src/snippets/code/src_corelib_kernel_qabstracteventdispatcher.cpp 0
Note that the type of the \a message is platform dependent. The
- following table shows the \a {message}'s type on Windows, Mac, and
- X11. You can do a static cast to these types.
+ following table shows the \a {message}'s type on Windows, Mac, X11
+ and BlackBerry. You can do a static cast to these types.
\table
\header
@@ -479,6 +479,9 @@ void QAbstractEventDispatcher::closingDown()
\row
\o Mac
\o NSEvent
+ \row
+ \o BlackBerry
+ \o bps_event_t
\endtable
diff --git a/src/gui/kernel/qeventdispatcher_blackberry_qpa.cpp b/src/gui/kernel/qeventdispatcher_blackberry_qpa.cpp
index 375c303..253878e 100644
--- a/src/gui/kernel/qeventdispatcher_blackberry_qpa.cpp
+++ b/src/gui/kernel/qeventdispatcher_blackberry_qpa.cpp
@@ -66,10 +66,9 @@ static bool sendWindowSystemEvents(QAbstractEventDispatcher *eventDispatcher, QE
break;
}
- if (eventDispatcher->filterEvent(event)) {
- delete event;
- continue;
- }
+ // in contrast to the common QPA version we don't put window system events
+ // into the event filter here, instead native bps events are filtered in
+ // QEventDispatcherBlackberry::select()
nevents++;