diff options
| author | Shawn Rutledge <shawn.rutledge@theqtcompany.com> | 2016-07-12 18:12:42 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2016-07-12 21:22:47 +0000 |
| commit | b53ea019c4e0ab50bc2c505d64d21e9fe1f32266 (patch) | |
| tree | 35acb3f5a5470f2824ac2136ec0ea5d042fee331 /src/quick/items/qquickevents_p_p.h | |
| parent | 647c36b81eb8ea57df2dffcda2399b64867a7ec9 (diff) | |
Don't store Qt::TouchPointState in 4 bits
It's not enough on Windows: it gets sign-extended, so 0x08 becomes -8
as an int, in comparisons. The result was that touchpoints were never
released.
Anyway we hardly have to worry about this now that we're not copying
the event points.
Change-Id: I0d47a0974a9cf5bc9a090a15948d112df32403eb
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/quick/items/qquickevents_p_p.h')
| -rw-r--r-- | src/quick/items/qquickevents_p_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index af3e385ce6..04f43667a7 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -317,7 +317,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickEventPoint : public QObject Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted) public: - QQuickEventPoint() : QObject(), m_pointId(0), m_valid(false), m_accept(false), m_state(Qt::TouchPointReleased) + QQuickEventPoint() : QObject(), m_pointId(0), m_state(Qt::TouchPointReleased), m_valid(false), m_accept(false) { Q_UNUSED(m_reserved); } @@ -343,10 +343,10 @@ public: private: QPointF m_scenePos; quint64 m_pointId; + Qt::TouchPointState m_state; bool m_valid : 1; bool m_accept : 1; - Qt::TouchPointState m_state : 4; - int m_reserved : 26; + int m_reserved : 30; }; class Q_QUICK_PRIVATE_EXPORT QQuickEventTouchPoint : public QQuickEventPoint |