From 7a94cd02f7f45a4b58b494ec81fa425725ca9e0c Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@jollamobile.com>
Date: Mon, 25 Nov 2013 23:55:22 +0100
Subject: When the MouseArea loses grab, an active drag should be cancelled.

Change-Id: Icc784dd3265c211d9b077b692464591a41976354
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
---
 src/quick/items/qquickmousearea.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/quick/items/qquickmousearea.cpp')

diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index ca64ebb6e3..2467d7252a 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -823,6 +823,12 @@ void QQuickMouseArea::ungrabMouse()
         d->pressed = 0;
         d->stealMouse = false;
         setKeepMouseGrab(false);
+
+#ifndef QT_NO_DRAGANDDROP
+        if (d->drag)
+            d->drag->setActive(false);
+#endif
+
         emit canceled();
         emit pressedChanged();
         emit pressedButtonsChanged();
-- 
cgit v1.2.3