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

client: make drag and drop in same control works again

Browse Source 
This amends 8a48175f26038541dfc1186d938dc46edb6048ab.

examples/widgets/draganddrop/draggabletext in qtbase now is fine.

Pick-to: 6.6
Fixes: QTBUG-116344
Change-Id: Ie930586fa7c6468c0e859786d968ad2343057e4d
Reviewed-by: David Redondo <qt@david-redondo.de>
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Liang Qi 2023-09-06 14:37:33 +02:00
parent 40720551fd
commit ea30d389f8
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,6 +214,7 @@ void QWaylandDataDevice::data_device_enter(uint32_t serial, wl_surface *surface,
QDrag *drag = static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->currentDrag(); QDrag *drag = static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->currentDrag();
if (drag) { if (drag) {
dragData = drag->mimeData(); dragData = drag->mimeData();
supportedActions = drag->supportedActions();
} else if (m_dragOffer) { } else if (m_dragOffer) {
dragData = m_dragOffer->mimeData(); dragData = m_dragOffer->mimeData();
supportedActions = m_dragOffer->supportedActions(); supportedActions = m_dragOffer->supportedActions();