1 files changed, 9 insertions, 9 deletions

diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index ef482ef08..2005cdce9 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -115,6 +115,7 @@
 #include <QtCore/qmimedata.h>
 #include <QtCore/qtemporarydir.h>
 #include <QtGui/qdrag.h>
+#include <QtGui/QDragEnterEvent>
 #include <QtGui/qpixmap.h>
 
 // Can't include headers as qaccessible.h conflicts with Chromium headers.
@@ -714,8 +715,8 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
     }
 
     // convert the custom headers into the format that chromium expects
-    QVector<QByteArray> headers = request.headers();
-    for (QVector<QByteArray>::const_iterator it = headers.cbegin(); it != headers.cend(); ++it) {
+    QList<QByteArray> headers = request.headers();
+    for (QList<QByteArray>::const_iterator it = headers.cbegin(); it != headers.cend(); ++it) {
         if (params.extra_headers.length() > 0)
             params.extra_headers += '\n';
         params.extra_headers += (*it).toStdString() + ": " + request.header(*it).toStdString();
@@ -1112,7 +1113,6 @@ void WebContentsAdapter::download(const QUrl &url, const QString &suggestedFileN
     if (!dlm)
         return;
 
-    dlmd->markNextDownloadAsUserRequested();
     dlm->SetDelegate(dlmd);
 
     net::NetworkTrafficAnnotationTag traffic_annotation =
@@ -1635,19 +1635,19 @@ void WebContentsAdapter::enterDrag(QDragEnterEvent *e, const QPointF &screenPos)
 
     content::RenderViewHost *rvh = m_webContents->GetRenderViewHost();
     rvh->GetWidget()->FilterDropData(m_currentDropData.get());
-    rvh->GetWidget()->DragTargetDragEnter(*m_currentDropData, toGfx(e->posF()), toGfx(screenPos),
+    rvh->GetWidget()->DragTargetDragEnter(*m_currentDropData, toGfx(e->position()), toGfx(screenPos),
                                           toWeb(e->possibleActions()),
-                                          toWeb(e->mouseButtons()) | toWeb(e->keyboardModifiers()));
+                                          toWeb(e->buttons()) | toWeb(e->modifiers()));
 }
 
 Qt::DropAction WebContentsAdapter::updateDragPosition(QDragMoveEvent *e, const QPointF &screenPos)
 {
     CHECK_INITIALIZED(Qt::DropAction());
     content::RenderViewHost *rvh = m_webContents->GetRenderViewHost();
-    m_lastDragClientPos = e->posF();
+    m_lastDragClientPos = e->position();
     m_lastDragScreenPos = screenPos;
     rvh->GetWidget()->DragTargetDragOver(toGfx(m_lastDragClientPos), toGfx(m_lastDragScreenPos), toWeb(e->possibleActions()),
-                                         toWeb(e->mouseButtons()) | toWeb(e->keyboardModifiers()));
+                                         toWeb(e->buttons()) | toWeb(e->modifiers()));
     waitForUpdateDragActionCalled();
     return toQt(blink::WebDragOperation(m_currentDropAction));
 }
@@ -1690,10 +1690,10 @@ void WebContentsAdapter::endDragging(QDropEvent *e, const QPointF &screenPos)
     CHECK_INITIALIZED();
     content::RenderViewHost *rvh = m_webContents->GetRenderViewHost();
     rvh->GetWidget()->FilterDropData(m_currentDropData.get());
-    m_lastDragClientPos = e->posF();
+    m_lastDragClientPos = e->position();
     m_lastDragScreenPos = screenPos;
     rvh->GetWidget()->DragTargetDrop(*m_currentDropData, toGfx(m_lastDragClientPos), toGfx(m_lastDragScreenPos),
-                                     toWeb(e->mouseButtons()) | toWeb(e->keyboardModifiers()));
+                                     toWeb(e->buttons()) | toWeb(e->modifiers()));
 
     m_currentDropData.reset();
 }