1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"

Browse Source
This commit is contained in:
Qt Forward Merge Bot 2019-06-15 03:02:02 +02:00
commit f87f59d9e5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/wayland/qwaylanddatadevice.cpp
View File

@ -111,7 +111,10 @@ void QWaylandDataDevice::startDrag(QMimeData *mimeData, QWaylandWindow *icon)
if (!origin) if (!origin)
origin = m_display->currentInputDevice()->touchFocus(); origin = m_display->currentInputDevice()->touchFocus();
if (origin)
start_drag(m_dragSource->object(), origin->object(), icon->object(), m_display->currentInputDevice()->serial()); start_drag(m_dragSource->object(), origin->object(), icon->object(), m_display->currentInputDevice()->serial());
else
qCDebug(lcQpaWayland) << "Couldn't start a drag because the origin window could not be found.";
} }
void QWaylandDataDevice::cancelDrag() void QWaylandDataDevice::cancelDrag()