diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2020-07-15 11:56:00 +0200 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2020-08-13 12:33:48 +0200 |
| commit | 0c0500717e3bb329ceeef764fd6b962af10488cf (patch) | |
| tree | 5abffa55b82c49f0f59e7779b4509d58d0e063a4 /src/webengine/api/qquickwebengineview.cpp | |
| parent | 5189f03b0078567f6a0c1fa32780314cb7451102 (diff) | |
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>
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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) |