diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-08-05 13:22:35 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2016-08-05 12:45:20 +0000 |
commit | ff5e0800cea669cb9b398ea81bc0c1e0d2446f01 (patch) | |
tree | c498c8ebaf6a05150eb7de87d0dd56de7628cdb5 /src/quick/items/qquickevents_p_p.h | |
parent | b07b41edb266a2a5d7cf83aa63e6eb1e69183ccd (diff) |
Move m_synthMouseEvent into TouchPointerEvent
The mouse pointer event doesn't need it.
Change-Id: I68999f79a0d979cf414b11a2e6b4863df1a1e817
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickevents_p_p.h')
-rw-r--r-- | src/quick/items/qquickevents_p_p.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index 6dee1f5b45..197166526c 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -327,7 +327,7 @@ public: , m_event(nullptr) , m_button(Qt::NoButton) , m_pressedButtons(Qt::NoButton) - , m_synthMouseEvent(QEvent::MouseMove, QPointF(), Qt::NoButton, Qt::NoButton, Qt::NoModifier) { } + { } virtual ~QQuickPointerEvent(); @@ -368,7 +368,6 @@ protected: QInputEvent *m_event; // original event as received by QQuickWindow Qt::MouseButton m_button; Qt::MouseButtons m_pressedButtons; - mutable QMouseEvent m_synthMouseEvent; Q_DISABLE_COPY(QQuickPointerEvent) }; @@ -404,7 +403,10 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPointerTouchEvent : public QQuickPointerEvent Q_OBJECT public: QQuickPointerTouchEvent(QObject *parent = nullptr) - : QQuickPointerEvent(parent), m_pointCount(0) { } + : QQuickPointerEvent(parent) + , m_pointCount(0) + , m_synthMouseEvent(QEvent::MouseMove, QPointF(), Qt::NoButton, Qt::NoButton, Qt::NoModifier) + { } QQuickPointerEvent *reset(QEvent *) override; bool isPressEvent() const override; @@ -426,6 +428,7 @@ public: private: int m_pointCount; QVector<QQuickEventTouchPoint *> m_touchPoints; + mutable QMouseEvent m_synthMouseEvent; Q_DISABLE_COPY(QQuickPointerTouchEvent) }; |