From 3e760da85aa485e09555c7b8594d194485494f8b Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Mon, 23 Jul 2012 13:45:21 +0100 Subject: [PATCH] QNX: Use new native event filtering api Change-Id: Iaf25697e6250ad29085647db4b8e50e274599227 Reviewed-by: Kevin Krammer Reviewed-by: David Faure --- src/corelib/kernel/qabstractnativeeventfilter.cpp | 3 +++ src/corelib/kernel/qeventdispatcher_blackberry.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/kernel/qabstractnativeeventfilter.cpp b/src/corelib/kernel/qabstractnativeeventfilter.cpp index 69ce560f5d..eceeb06297 100644 --- a/src/corelib/kernel/qabstractnativeeventfilter.cpp +++ b/src/corelib/kernel/qabstractnativeeventfilter.cpp @@ -98,6 +98,9 @@ QAbstractNativeEventFilter::~QAbstractNativeEventFilter() On Mac, \a eventType is set to "mac_generic_NSEvent", and the \a message can be casted to an EventRef. + On Blackberry (not plain QNX) \a eventType is set to "bps_event_t", and the \a message can be casted + to a bps_event_t pointer. + Example: \snippet code/src_corelib_kernel_qabstractnativeeventfilter.cpp 0 */ diff --git a/src/corelib/kernel/qeventdispatcher_blackberry.cpp b/src/corelib/kernel/qeventdispatcher_blackberry.cpp index 4b29613d88..9ad0632554 100644 --- a/src/corelib/kernel/qeventdispatcher_blackberry.cpp +++ b/src/corelib/kernel/qeventdispatcher_blackberry.cpp @@ -289,7 +289,7 @@ int QEventDispatcherBlackberry::select(int nfds, fd_set *readfds, fd_set *writef // pass all received events through filter - except IO ready events if (event && bps_event_get_domain(event) != bpsIOReadyDomain) - filterEvent((void*)event); + filterNativeEvent(QByteArrayLiteral("bps_event_t"), static_cast(event), 0); } while (timer.elapsed() < timeout_ms); // \TODO Remove this when bps is fixed (see comment above)