diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-29 13:01:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-29 13:01:22 +0100 |
| commit | 1e421097f08876f5e2242be6f7a20db2aeb51692 (patch) | |
| tree | c45b9323368cfdede67facd43c076a85322f12f6 /src/quick/items/qquickdroparea.cpp | |
| parent | f4788a13e98aa4e5438327094524d7b8239893ec (diff) | |
| parent | 666bc731a0ba930ca0cfda18daf836913fd91361 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Iec1b2de53c275996364c4bab0123ccb3e6e9895e
Diffstat (limited to 'src/quick/items/qquickdroparea.cpp')
| -rw-r--r-- | src/quick/items/qquickdroparea.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp index aecdcdbc28..1701441240 100644 --- a/src/quick/items/qquickdroparea.cpp +++ b/src/quick/items/qquickdroparea.cpp @@ -270,6 +270,8 @@ void QQuickDropArea::dragEnterEvent(QDragEnterEvent *event) QQuickDropEvent dragTargetEvent(d, event); emit entered(&dragTargetEvent); + if (!event->isAccepted()) + return; d->containsDrag = true; if (QQuickDragMimeData *dragMime = qobject_cast<QQuickDragMimeData *>(const_cast<QMimeData *>(mimeData))) |