diff options
| author | Liang Qi <liang.qi@qt.io> | 2023-09-06 14:37:33 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-09-10 09:42:40 +0000 |
| commit | 14d7659c78dd09503e63fd7e5a35a215186b1e20 (patch) | |
| tree | 5188efa549cb24732e480f12d1f7004666a78267 | |
| parent | fd2efc4913b51d4b61f04a254031dba851c4ed50 (diff) | |
client: make drag and drop in same control works again
This amends 40a27c26cee7ad4e5e32eb01568777cd4e9da25c.
examples/widgets/draganddrop/draggabletext in qtbase now is fine.
Fixes: QTBUG-116344
Change-Id: Ie930586fa7c6468c0e859786d968ad2343057e4d
Reviewed-by: David Redondo <qt@david-redondo.de>
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit 38f5679d57c7b05753ac1ab27d94b60dc10a340a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/client/qwaylanddatadevice.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp index 80a9a7739..fe8e91235 100644 --- a/src/client/qwaylanddatadevice.cpp +++ b/src/client/qwaylanddatadevice.cpp @@ -214,6 +214,7 @@ void QWaylandDataDevice::data_device_enter(uint32_t serial, wl_surface *surface, QDrag *drag = static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->currentDrag(); if (drag) { dragData = drag->mimeData(); + supportedActions = drag->supportedActions(); } else if (m_dragOffer) { dragData = m_dragOffer->mimeData(); supportedActions = m_dragOffer->supportedActions(); |