summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Lysenko <lysenkoalexmail@gmail.com>2016-12-13 17:08:04 +0200
committerAleksey Lysenko <lysenkoalexmail@gmail.com>2016-12-15 19:22:53 +0000
commit28dffdecdad4f3458b9aacec1a04803c7b5483a1 (patch)
treea0910c33685ff2d6892899576f4728902db98e8b
parent7797c13131574f369e09970834f96d67e11a5e1d (diff)
Delete aborted QDrag
Aborted QDrag object has never been removed, moreover there was no way to know a previous drag-and-drop operation status Task-number: QTBUG-53990 Change-Id: I2b6a7aad86d94b9d5083f9799fe54752c251660b Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--src/plugins/platforms/xcb/qxcbdrag.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp
index 494cecb3d1..58fb1f3918 100644
--- a/src/plugins/platforms/xcb/qxcbdrag.cpp
+++ b/src/plugins/platforms/xcb/qxcbdrag.cpp
@@ -1121,6 +1121,9 @@ void QXcbDrag::cancel()
QBasicDrag::cancel();
if (current_target)
send_leave();
+
+ // remove canceled object
+ currentDrag()->deleteLater();
}
// find an ancestor with XdndAware on it