diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-09-22 09:42:48 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-09-22 14:34:36 +0000 |
| commit | ce019efb5cfcc0bce516a761be4295c568994a31 (patch) | |
| tree | a0c66115fe22df25310723336794a7f8c02c605f /src | |
| parent | bcdd07ceb831120d8c93287771d09b9501a8f9c3 (diff) | |
add back the device-less QNativeGestureEvent (deprecated)
It was an oversight in 83729ad7a1e2d9c75ddf7238ab7c91b514dcebcf
that this constructor is still in use in other modules. And in fact
we cannot remove public constructors without deprecating them first.
Task-number: QTBUG-63355
Change-Id: I64dbf9bc54c0bf6be7157f047b548d3b2c5bc2ed
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 12 | ||||
| -rw-r--r-- | src/gui/kernel/qevent.h | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index df093ddbf6..7b1eb277b2 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -2758,6 +2758,18 @@ Qt::MouseButtons QTabletEvent::buttons() const */ /*! + \deprecated The QTouchDevice parameter is now required +*/ +#if QT_DEPRECATED_SINCE(5, 10) +QNativeGestureEvent::QNativeGestureEvent(Qt::NativeGestureType type, const QPointF &localPos, const QPointF &windowPos, + const QPointF &screenPos, qreal realValue, ulong sequenceId, quint64 intValue) + : QInputEvent(QEvent::NativeGesture), mGestureType(type), mTouchDeviceId(255), + mLocalPos(localPos), mWindowPos(windowPos), mScreenPos(screenPos), mRealValue(realValue), + mSequenceId(sequenceId), mIntValue(intValue) +{ } +#endif + +/*! Constructs a native gesture event of type \a type. The points \a localPos, \a windowPos and \a screenPos specify the diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index e439b0ca54..a6f97a21dc 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -301,6 +301,10 @@ protected: class Q_GUI_EXPORT QNativeGestureEvent : public QInputEvent { public: +#if QT_DEPRECATED_SINCE(5, 10) + QT_DEPRECATED QNativeGestureEvent(Qt::NativeGestureType type, const QPointF &localPos, const QPointF &windowPos, + const QPointF &screenPos, qreal value, ulong sequenceId, quint64 intArgument); +#endif QNativeGestureEvent(Qt::NativeGestureType type, const QTouchDevice *dev, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos, qreal value, ulong sequenceId, quint64 intArgument); Qt::NativeGestureType gestureType() const { return mGestureType; } |