diff options
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qevent.h | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface.h | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface_p.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index ec1934a522..85602a9dd0 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -2822,7 +2822,7 @@ QNativeGestureEvent::QNativeGestureEvent(Qt::NativeGestureType type, const QPoin */ QNativeGestureEvent::QNativeGestureEvent(Qt::NativeGestureType type, const QPointingDevice *device, int fingerCount, const QPointF &localPos, const QPointF &scenePos, - const QPointF &globalPos, qreal value, QVector2D deltas, + const QPointF &globalPos, qreal value, const QPointF &deltas, quint64 sequenceId) : QSinglePointEvent(QEvent::NativeGesture, device, localPos, scenePos, globalPos, Qt::NoButton, Qt::NoButton, Qt::NoModifier), diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 6f38ef8d82..374e94bf35 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -416,7 +416,7 @@ public: #endif QNativeGestureEvent(Qt::NativeGestureType type, const QPointingDevice *dev, int fingerCount, const QPointF &localPos, const QPointF &scenePos, const QPointF &globalPos, - qreal value, QVector2D deltas, quint64 sequenceId = UINT64_MAX); + qreal value, const QPointF &deltas, quint64 sequenceId = UINT64_MAX); ~QNativeGestureEvent(); QNativeGestureEvent *clone() const override { return new QNativeGestureEvent(*this); } @@ -424,7 +424,7 @@ public: Qt::NativeGestureType gestureType() const { return m_gestureType; } int fingerCount() const { return m_fingerCount; } qreal value() const { return m_realValue; } - QVector2D deltas() const { return m_deltas; } + QPointF deltas() const { return m_deltas.toPointF(); } #if QT_DEPRECATED_SINCE(6, 0) #ifndef QT_NO_INTEGER_EVENT_COORDINATES diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index 31097dfac6..70db73b5d3 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -1057,7 +1057,7 @@ bool QWindowSystemInterface::handleGestureEventWithRealValue(QWindow *window, ul } bool QWindowSystemInterface::handleGestureEventWithValueAndDeltas(QWindow *window, ulong timestamp, const QPointingDevice *device, - Qt::NativeGestureType type, qreal value, QVector2D deltas, + Qt::NativeGestureType type, qreal value, const QPointF &deltas, const QPointF &local, const QPointF &global, int fingerCount) { QWindowSystemInterfacePrivate::GestureEvent *e = diff --git a/src/gui/kernel/qwindowsysteminterface.h b/src/gui/kernel/qwindowsysteminterface.h index 742d8201dd..b8cb06e545 100644 --- a/src/gui/kernel/qwindowsysteminterface.h +++ b/src/gui/kernel/qwindowsysteminterface.h @@ -299,7 +299,7 @@ public: static bool handleGestureEventWithRealValue(QWindow *window, ulong timestamp, const QPointingDevice *device, Qt::NativeGestureType type, qreal value, const QPointF &local, const QPointF &global, int fingerCount = 2); static bool handleGestureEventWithValueAndDeltas(QWindow *window, ulong timestamp, const QPointingDevice *device, Qt::NativeGestureType type, qreal value, - QVector2D deltas, const QPointF &local, const QPointF &global, int fingerCount = 2); + const QPointF &deltas, const QPointF &local, const QPointF &global, int fingerCount = 2); #endif // QT_NO_GESTURES static void handlePlatformPanelEvent(QWindow *window); diff --git a/src/gui/kernel/qwindowsysteminterface_p.h b/src/gui/kernel/qwindowsysteminterface_p.h index 742e22f7e8..0729c1ea39 100644 --- a/src/gui/kernel/qwindowsysteminterface_p.h +++ b/src/gui/kernel/qwindowsysteminterface_p.h @@ -458,7 +458,7 @@ public: Qt::NativeGestureType type; QPointF pos; QPointF globalPos; - QVector2D deltas; + QPointF deltas; int fingerCount; // Mac qreal realValue; |