diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-05 13:32:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-05 13:37:21 +0100 |
| commit | 53b141dcebc2ca423dbc31e5b6321a769155e9a4 (patch) | |
| tree | e62c7d9875acab8094d64d137c90e7e5f53c0893 /src/plugins/platforms/xcb/qxcbdrag.h | |
| parent | 2c6c044500a92a3a125ce4b5d936992bdf02a487 (diff) | |
| parent | 6508fdca1dcc7105947befadba272d0fd4bbc27f (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/platforms/ios/quiview.mm
Change-Id: I88384c70047391c75d9ff166c8d9881ff6751dbf
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbdrag.h')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbdrag.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbdrag.h b/src/plugins/platforms/xcb/qxcbdrag.h index f261cc1322..31f1c47d83 100644 --- a/src/plugins/platforms/xcb/qxcbdrag.h +++ b/src/plugins/platforms/xcb/qxcbdrag.h @@ -135,6 +135,10 @@ private: QRect source_sameanswer; bool waiting_for_status; + // helpers for setting executed drop action outside application + bool dropped; + bool canceled; + // top-level window we sent position to last. xcb_window_t current_target; // window to send events to (always valid if current_target) |