3 files changed, 54 insertions, 1 deletions

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 7b0ed0a33..df1f46852 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -621,6 +621,11 @@ BrowserContextAdapter *QQuickWebEngineViewPrivate::browserContextAdapter()
     return m_profile->d_ptr->browserContext();
 }
 
+WebContentsAdapter *QQuickWebEngineViewPrivate::webContentsAdapter()
+{
+    return adapter.data();
+}
+
 WebEngineSettings *QQuickWebEngineViewPrivate::webEngineSettings() const
 {
     return m_settings->d_ptr.data();
@@ -749,7 +754,8 @@ QQuickWebEngineView::QQuickWebEngineView(QQuickItem *parent)
     Q_D(QQuickWebEngineView);
     d->e->q_ptr = d->q_ptr = this;
     this->setActiveFocusOnTab(true);
-    this->setFlags(QQuickItem::ItemIsFocusScope | QQuickItem::ItemAcceptsInputMethod);
+    this->setFlags(QQuickItem::ItemIsFocusScope | QQuickItem::ItemAcceptsInputMethod
+                   | QQuickItem::ItemAcceptsDrops);
 
 #ifndef QT_NO_ACCESSIBILITY
     QQuickAccessibleAttached *accessible = QQuickAccessibleAttached::qmlAttachedProperties(this);
@@ -999,6 +1005,13 @@ void QQuickWebEngineViewPrivate::renderProcessTerminated(
                                       renderProcessExitStatus(terminationStatus)), exitCode);
 }
 
+void QQuickWebEngineViewPrivate::startDragging(const content::DropData &dropData,
+                                               Qt::DropActions allowedActions,
+                                               const QPixmap &pixmap, const QPoint &offset)
+{
+    adapter->startDragging(q_ptr->window(), dropData, allowedActions, pixmap, offset);
+}
+
 bool QQuickWebEngineView::isLoading() const
 {
     Q_D(const QQuickWebEngineView);
@@ -1265,6 +1278,39 @@ void QQuickWebEngineView::itemChange(ItemChange change, const ItemChangeData &va
     QQuickItem::itemChange(change, value);
 }
 
+static QPoint mapToScreen(const QQuickItem *item, const QPoint &clientPos)
+{
+    return item->window()->position() + item->mapToScene(clientPos).toPoint();
+}
+
+void QQuickWebEngineView::dragEnterEvent(QDragEnterEvent *e)
+{
+    Q_D(QQuickWebEngineView);
+    e->accept();
+    d->adapter->enterDrag(e, mapToScreen(this, e->pos()));
+}
+
+void QQuickWebEngineView::dragLeaveEvent(QDragLeaveEvent *e)
+{
+    Q_D(QQuickWebEngineView);
+    e->accept();
+    d->adapter->leaveDrag();
+}
+
+void QQuickWebEngineView::dragMoveEvent(QDragMoveEvent *e)
+{
+    Q_D(QQuickWebEngineView);
+    e->accept();
+    d->adapter->updateDragPosition(e, mapToScreen(this, e->pos()));
+}
+
+void QQuickWebEngineView::dropEvent(QDropEvent *e)
+{
+    Q_D(QQuickWebEngineView);
+    e->accept();
+    d->adapter->endDragging(e->pos(), mapToScreen(this, e->pos()));
+}
+
 void QQuickWebEngineView::triggerWebAction(WebAction action)
 {
     Q_D(QQuickWebEngineView);
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index 9f7a45156..c533d0fca 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -329,6 +329,10 @@ Q_SIGNALS:
 protected:
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
     void itemChange(ItemChange, const ItemChangeData &);
+    void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE;
+    void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE;
+    void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE;
+    void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QQuickWebEngineView)
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index 69ba60ccd..beb5b49bc 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -174,8 +174,11 @@ public:
                                      int exitCode) Q_DECL_OVERRIDE;
     virtual void updateScrollPosition(const QPointF &position) Q_DECL_OVERRIDE;
     virtual void updateContentsSize(const QSizeF &size) Q_DECL_OVERRIDE;
+    void startDragging(const content::DropData &dropData, Qt::DropActions allowedActions,
+                       const QPixmap &pixmap, const QPoint &offset) Q_DECL_OVERRIDE;
 
     virtual QtWebEngineCore::BrowserContextAdapter *browserContextAdapter() Q_DECL_OVERRIDE;
+    QtWebEngineCore::WebContentsAdapter *webContentsAdapter() Q_DECL_OVERRIDE;
 
     void setDevicePixelRatio(qreal);
     void adoptWebContents(QtWebEngineCore::WebContentsAdapter *webContents);