diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 20:21:09 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-05-06 22:20:08 +0000 |
| commit | 857912b605ea11f6f1e782edfb40555d831eb9ad (patch) | |
| tree | 49a4174a44e06ba55e9253e2e7f6f45fe1764c5c /src/plugins/platforms/xcb/qxcbdrag.cpp | |
| parent | 5aeafcea467ced35adca1d762d38bfbba2b59e1f (diff) | |
| parent | dbef41f43ece97d8ac4d6b63f7a36afcb7e7b7f7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbdrag.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbdrag.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp index 1c9faa17ea..b55fbd8f03 100644 --- a/src/plugins/platforms/xcb/qxcbdrag.cpp +++ b/src/plugins/platforms/xcb/qxcbdrag.cpp @@ -1140,10 +1140,10 @@ void QXcbDrag::handleSelectionRequest(const xcb_selection_request_event_t *event at = findTransactionByWindow(event->requestor); } - if (at == -1 && event->time == XCB_CURRENT_TIME) { + if (at == -1) { xcb_window_t target = findXdndAwareParent(connection(), event->requestor); if (target) { - if (current_target == target) + if (event->time == XCB_CURRENT_TIME && current_target == target) at = -2; else at = findTransactionByWindow(target); |