diff options
| author | Fushan Wen <qydwhotmail@gmail.com> | 2022-09-18 18:17:18 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-09-22 11:25:47 +0000 |
| commit | 15781de44b6f8aa22b5c7db947202586d0a2f319 (patch) | |
| tree | 7be7b31239bb3b4f19b2d0783a1fbd9a4bebad00 | |
| parent | aaeed7b692b3144e4d37b767b18737a243968af9 (diff) | |
| download | qtwayland-15781de44b6f8aa22b5c7db947202586d0a2f319.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
Change-Id: Ib93040648da88a433d647c87adcb7a7fabcaef6c
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit c92282b865efcf8c571bb52b5f96d8ad260a1cda)
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 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(); } |