diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:56:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:56:36 +0100 |
| commit | eccf02a09ee5866fc971b5ff9f36aef5874bd25c (patch) | |
| tree | 4b8c49abbd15c91ed483e44e6708eedb716c8202 /src/webengine | |
| parent | ebc88886041fb1f38c22e2ef33b17ca1baff7bc8 (diff) | |
| parent | 35c38346e65fe26c75bbe08c7002f645ea53fec1 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Ic36a80502730d404ab96dfa11ff1eb0ac6eb302d
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index b543d27b1..2db25584c 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -1527,8 +1527,13 @@ void QQuickWebEngineView::dragLeaveEvent(QDragLeaveEvent *e) void QQuickWebEngineView::dragMoveEvent(QDragMoveEvent *e) { Q_D(QQuickWebEngineView); - e->accept(); - d->adapter->updateDragPosition(e, mapToScreen(this, e->pos())); + Qt::DropAction dropAction = d->adapter->updateDragPosition(e, mapToScreen(this, e->pos())); + if (Qt::IgnoreAction == dropAction) { + e->ignore(); + } else { + e->setDropAction(dropAction); + e->accept(); + } } void QQuickWebEngineView::dropEvent(QDropEvent *e) |