summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication_mac.mm
diff options
context:
space:
mode:
authorCédric Luthi <cluthi@sente.ch>2009-07-01 10:03:55 (GMT)
committerNorwegian Rock Cat <qt-info@nokia.com>2009-07-01 10:09:01 (GMT)
commit3618227de7036a091ea8187a20434470c0c792dc (patch)
tree73583e41db7738ee7d7e95fc561a9c426b313e1c /src/gui/kernel/qapplication_mac.mm
parent82e825ed841bce324a6892fcbace03f9936d4f4f (diff)
downloadQt-3618227de7036a091ea8187a20434470c0c792dc.zip
Qt-3618227de7036a091ea8187a20434470c0c792dc.tar.gz
Qt-3618227de7036a091ea8187a20434470c0c792dc.tar.bz2
Never discard TabletRelease events as they may be delivered *after* TabletLeaveProximity events
Merge-request: 788 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
Diffstat (limited to 'src/gui/kernel/qapplication_mac.mm')
-rw-r--r--src/gui/kernel/qapplication_mac.mm3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm
index 04f4cc9..ce4e422 100644
--- a/src/gui/kernel/qapplication_mac.mm
+++ b/src/gui/kernel/qapplication_mac.mm
@@ -1877,7 +1877,8 @@ QApplicationPrivate::globalEventProcessor(EventHandlerCallRef er, EventRef event
tablet_button_state = new_tablet_button_state;
QMacTabletHash *tabletHash = qt_mac_tablet_hash();
- if (!tabletHash->contains(tabletPointRec.deviceID)) {
+ if (!tabletHash->contains(tabletPointRec.deviceID) && t != QEvent::TabletRelease) {
+ // Never discard TabletRelease events as they may be delivered *after* TabletLeaveProximity events
qWarning("handleTabletEvent: This tablet device is unknown"
" (received no proximity event for it). Discarding event.");
return false;