diff options
| author | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-23 19:00:59 +0000 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-23 19:00:59 +0000 |
| commit | 7d5a183e9d0a75b59e03174064c56126bb9a4487 (patch) | |
| tree | 89ff5acf9eae31a88655c8b75b4fa0620b263aa3 /src/gui | |
| parent | cf4e6070987a580d1722c9939be73e181c9b1ee5 (diff) | |
| parent | c0e31d638761a003042cf2e1f19c283eb9136ffc (diff) | |
Merge integration refs/builds/qtci/dev/1616509627
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface.cpp | 11 | ||||
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface.h | 2 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index 2f26d38dde..a79ff07c54 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -1058,17 +1058,6 @@ bool QWindowSystemInterface::handleGestureEventWithRealValue(QWindow *window, ul e->realValue = value; return QWindowSystemInterfacePrivate::handleWindowSystemEvent(e); } - -bool QWindowSystemInterface::handleGestureEventWithSequenceIdAndValue(QWindow *window, ulong timestamp, const QPointingDevice *device, - Qt::NativeGestureType type, ulong sequenceId, quint64 value, - const QPointF &local, const QPointF &global) -{ - QWindowSystemInterfacePrivate::GestureEvent *e = - new QWindowSystemInterfacePrivate::GestureEvent(window, timestamp, type, device, local, global); - e->sequenceId = sequenceId; - e->intValue = value; - return QWindowSystemInterfacePrivate::handleWindowSystemEvent(e); -} #endif // QT_NO_GESTURES void QWindowSystemInterface::handlePlatformPanelEvent(QWindow *w) diff --git a/src/gui/kernel/qwindowsysteminterface.h b/src/gui/kernel/qwindowsysteminterface.h index 13a428d837..1df4873c68 100644 --- a/src/gui/kernel/qwindowsysteminterface.h +++ b/src/gui/kernel/qwindowsysteminterface.h @@ -302,8 +302,6 @@ public: const QPointF &local, const QPointF &global); static bool handleGestureEventWithRealValue(QWindow *window, ulong timestamp, const QPointingDevice *device, Qt::NativeGestureType type, qreal value, const QPointF &local, const QPointF &global); - static bool handleGestureEventWithSequenceIdAndValue(QWindow *window, ulong timestamp, const QPointingDevice *device, Qt::NativeGestureType type, - ulong sequenceId, quint64 value, const QPointF &local, const QPointF &global); #endif // QT_NO_GESTURES static void handlePlatformPanelEvent(QWindow *window); |