diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-09-29 13:37:46 +0200 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-09-29 13:38:11 +0200 |
| commit | 8ab25620d3df25c43011ae982f4614639578afb3 (patch) | |
| tree | e94d53c6b7d231ca18f0787a0c09bec07d163a67 /src/plugins/platforms/xcb/qxcbclipboard.cpp | |
| parent | dfe853bff90444edf92a993e391df853780c9e8d (diff) | |
| parent | 5222abfdf5f034bad12bbe12312a4149550495b7 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/network/socket/qnativesocketengine_unix.cpp
src/widgets/kernel/qwidget_qpa.cpp
Change-Id: I6f1aa320d5ca66cd92d601a95885aeaab0abb191
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbclipboard.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbclipboard.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp index d1e3ae6a88..45856f3e6c 100644 --- a/src/plugins/platforms/xcb/qxcbclipboard.cpp +++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp @@ -731,6 +731,9 @@ void QXcbClipboard::handleSelectionRequest(xcb_selection_request_event_t *req) void QXcbClipboard::handleXFixesSelectionRequest(xcb_xfixes_selection_notify_event_t *event) { QClipboard::Mode mode = modeForAtom(event->selection); + if (mode > QClipboard::Selection) + return; + // here we care only about the xfixes events that come from non Qt processes if (event->owner != XCB_NONE && event->owner != owner()) { if (!m_xClipboard[mode]) { |