Merge integration refs/builds/qtci/dev/1616509627

bb10
Qt CI Bot 2021-03-23 19:00:59 +00:00
commit 7d5a183e9d
2 changed files with 0 additions and 13 deletions

View File

@ -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)

View File

@ -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);