diff options
| author | John Stanley <jpsinthemix@verizon.net> | 2012-01-18 01:04:59 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-10 15:11:54 (GMT) |
| commit | 1095252559a937efcaaf012d8dfbb4e13c4fd6b5 (patch) | |
| tree | b595f56246fed2c8768d9149429b801e775c789a /src/gui/kernel/qclipboard_x11.cpp | |
| parent | 7252bda693ab99cb2e8013a1c7a051ae17ba7956 (diff) | |
| download | Qt-1095252559a937efcaaf012d8dfbb4e13c4fd6b5.zip Qt-1095252559a937efcaaf012d8dfbb4e13c4fd6b5.tar.gz Qt-1095252559a937efcaaf012d8dfbb4e13c4fd6b5.tar.bz2 | |
Pass events to installed event dispatcher event filters before passing them to x11ProcessEvent()
Change-Id: If551c732b520b0105a3d4578db1b039c1b5d49fd
Pass events to eventFilter first
Change-Id: If551c732b520b0105a3d4578db1b039c1b5d49fd
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/gui/kernel/qclipboard_x11.cpp')
| -rw-r--r-- | src/gui/kernel/qclipboard_x11.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp index 803b1ba..72110ed 100644 --- a/src/gui/kernel/qclipboard_x11.cpp +++ b/src/gui/kernel/qclipboard_x11.cpp @@ -579,7 +579,10 @@ bool QX11Data::clipboardWaitForEvent(Window win, int type, XEvent *event, int ti // process other clipboard events, since someone is probably requesting data from us XEvent e; - if (XCheckIfEvent(X11->display, &e, checkForClipboardEvents, 0)) + // Pass the event through the event dispatcher filter so that applications + // which install an event filter on the dispatcher get to handle it first. + if (XCheckIfEvent(X11->display, &e, checkForClipboardEvents, 0) && + !QAbstractEventDispatcher::instance()->filterEvent(&e)) qApp->x11ProcessEvent(&e); now.start(); |