diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-20 08:44:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-20 09:00:44 +0100 |
| commit | ae2695535a2f1abbd4c6596a22dd33319b9388dd (patch) | |
| tree | 91df41df365a13ea71b1361d909535e5b7a7360a /src/plugins/platforms/xcb/qxcbdrag.cpp | |
| parent | 8066ae49433ed7604e710eef7b15d15de171608e (diff) | |
| parent | c1a2f97a3b3a8c058b1760b57e5c83bf7815b84a (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qfilesystemengine_win.cpp
src/gui/text/qdistancefield.cpp
src/plugins/platforms/xcb/qxcbconnection.h
Change-Id: I1be4a6f440ccb7599991159e3cb9de60990e4b1e
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbdrag.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbdrag.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp index 908a6fdf82..d4521de8e0 100644 --- a/src/plugins/platforms/xcb/qxcbdrag.cpp +++ b/src/plugins/platforms/xcb/qxcbdrag.cpp @@ -1118,7 +1118,7 @@ static xcb_window_t findXdndAwareParent(QXcbConnection *c, xcb_window_t window) void QXcbDrag::handleSelectionRequest(const xcb_selection_request_event_t *event) { - xcb_selection_notify_event_t notify; + Q_DECLARE_XCB_EVENT(notify, xcb_selection_notify_event_t); notify.response_type = XCB_SELECTION_NOTIFY; notify.requestor = event->requestor; notify.selection = event->selection; |