From ea30d389f8943b140bb8b3631bcc40b313005a16 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 6 Sep 2023 14:37:33 +0200 Subject: [PATCH] client: make drag and drop in same control works again 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 Reviewed-by: Liang Qi --- src/plugins/platforms/wayland/qwaylanddatadevice.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/platforms/wayland/qwaylanddatadevice.cpp b/src/plugins/platforms/wayland/qwaylanddatadevice.cpp index 80a9a773915..fe8e91235ff 100644 --- a/src/plugins/platforms/wayland/qwaylanddatadevice.cpp +++ b/src/plugins/platforms/wayland/qwaylanddatadevice.cpp @@ -214,6 +214,7 @@ void QWaylandDataDevice::data_device_enter(uint32_t serial, wl_surface *surface, QDrag *drag = static_cast(QGuiApplicationPrivate::platformIntegration()->drag())->currentDrag(); if (drag) { dragData = drag->mimeData(); + supportedActions = drag->supportedActions(); } else if (m_dragOffer) { dragData = m_dragOffer->mimeData(); supportedActions = m_dragOffer->supportedActions();