Fix almost all deprecation warnings

Replace

 QString::fromUtf16({const ushort * -> const char16_t})
 QMap::{unite -> insert}
 Q{Hover,DragEnter,DragMove,Drop}Event::{posF() -> position()}
 Q{Hover,DragEnter,DragMove,Drop}Event::{pos() -> position().toPoint()}
 Q{DragEnter,Drop}Event::{mouseButtons -> buttons}
 Q{DragEnter,Drop}Event::{keyboardModifiers -> modifiers}
 QMouseEvent::{localPos -> position}
 QMouseEvent::{windowPos -> scenePosition}
 QMouseEvent::{screenPos -> globalPosition}

These should all be just renames without any change in behavior (save
for some floating point conversions). The one remaining issue concerns
the deprecation of binary JSON in qtbase, which is recommended to be
replaced with CBOR.

Change-Id: I8f3b533242fe9a58c08c2b09ff5d0bdbbfa6dd17
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 8 insertions, 7 deletions

diff --git a/src/webengine/api/qquickwebenginetouchhandleprovider.cpp b/src/webengine/api/qquickwebenginetouchhandleprovider.cpp
index 80f4727b6..56162b223 100644
--- a/src/webengine/api/qquickwebenginetouchhandleprovider.cpp
+++ b/src/webengine/api/qquickwebenginetouchhandleprovider.cpp
@@ -67,7 +67,7 @@ void QQuickWebEngineTouchHandleProvider::init(const QMap<int, QImage> &images)
         return;
     }
 
-    m_touchHandleMap.unite(images);
+    m_touchHandleMap.insert(images);
 }
 
 QImage QQuickWebEngineTouchHandleProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 0861d0ca9..e86f78e4d 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -1736,16 +1736,16 @@ void QQuickWebEngineView::itemChange(ItemChange change, const ItemChangeData &va
 }
 
 #if QT_CONFIG(draganddrop)
-static QPoint mapToScreen(const QQuickItem *item, const QPoint &clientPos)
+static QPointF mapToScreen(const QQuickItem *item, const QPointF &clientPos)
 {
-    return item->window()->position() + item->mapToScene(clientPos).toPoint();
+    return item->window()->position() + item->mapToScene(clientPos);
 }
 
 void QQuickWebEngineView::dragEnterEvent(QDragEnterEvent *e)
 {
     Q_D(QQuickWebEngineView);
     e->accept();
-    d->adapter->enterDrag(e, mapToScreen(this, e->pos()));
+    d->adapter->enterDrag(e, mapToScreen(this, e->position()));
 }
 
 void QQuickWebEngineView::dragLeaveEvent(QDragLeaveEvent *e)
@@ -1758,7 +1758,7 @@ void QQuickWebEngineView::dragLeaveEvent(QDragLeaveEvent *e)
 void QQuickWebEngineView::dragMoveEvent(QDragMoveEvent *e)
 {
     Q_D(QQuickWebEngineView);
-    Qt::DropAction dropAction = d->adapter->updateDragPosition(e, mapToScreen(this, e->pos()));
+    Qt::DropAction dropAction = d->adapter->updateDragPosition(e, mapToScreen(this, e->position()));
     if (Qt::IgnoreAction == dropAction) {
         e->ignore();
     } else {
@@ -1771,7 +1771,7 @@ void QQuickWebEngineView::dropEvent(QDropEvent *e)
 {
     Q_D(QQuickWebEngineView);
     e->accept();
-    d->adapter->endDragging(e, mapToScreen(this, e->pos()));
+    d->adapter->endDragging(e, mapToScreen(this, e->position()));
 }
 #endif // QT_CONFIG(draganddrop)
 
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
index ab5306590..6fcf7f3ac 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -272,7 +272,8 @@ void RenderWidgetHostViewQtDelegateQuick::hoverMoveEvent(QHoverEvent *event)
 {
     QQuickItem *parent = parentItem();
     if ((!m_isPopup && parent && !parent->property("activeFocusOnPress").toBool()
-         && !parent->hasActiveFocus()) || event->posF() == event->oldPosF()) {
+         && !parent->hasActiveFocus())
+        || event->position() == event->oldPosF()) {
         event->ignore();
         return;
     }