diff options
author | Fushan Wen <qydwhotmail@gmail.com> | 2022-09-18 18:17:18 +0800 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2022-09-22 10:55:01 +0000 |
commit | c92282b865efcf8c571bb52b5f96d8ad260a1cda (patch) | |
tree | 4046156545373ef538799c9bb500a093bd294ea6 | |
parent | 5bbe3ca7e0f437313718880ee7c61d4991c6d61c (diff) | |
download | qtwayland-c92282b865efcf8c571bb52b5f96d8ad260a1cda.tar.gz |
Call `finishDrag()` in `QWaylandDataDevice::dragSourceCancelled()`
Drags can either get finished or cancelled. If a drag is finished
successfully we call finish on the QBasicDrag instance, which quits
the nested event loop. This patch adds the connection for cancelled
drags.
See also: https://bugs.kde.org/show_bug.cgi?id=446111
Pick-to: 6.4 6.2 5.15
Change-Id: Ib93040648da88a433d647c87adcb7a7fabcaef6c
Reviewed-by: Liang Qi <liang.qi@qt.io>
-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 6034cd60..a7014f7a 100644 --- a/src/client/qwaylanddatadevice.cpp +++ b/src/client/qwaylanddatadevice.cpp @@ -261,6 +261,7 @@ void QWaylandDataDevice::selectionSourceCancelled() #if QT_CONFIG(draganddrop) void QWaylandDataDevice::dragSourceCancelled() { + static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->finishDrag(); m_dragSource.reset(); } |