diff options
| author | Robin Burchell <robin.burchell@jollamobile.com> | 2013-11-25 23:55:22 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-30 00:56:22 +0100 |
| commit | 7a94cd02f7f45a4b58b494ec81fa425725ca9e0c (patch) | |
| tree | 9dcec7f354781448107d4387df5dd738b021e60b /src/quick | |
| parent | 0aadcf8077840068eb182269e9ed9c31ad12f45e (diff) | |
When the MouseArea loses grab, an active drag should be cancelled.
Change-Id: Icc784dd3265c211d9b077b692464591a41976354
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickmousearea.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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(); |