diff options
| author | Jan Arve Saether <jan-arve.saether@qt.io> | 2016-09-02 12:58:43 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-09-16 14:46:06 +0000 |
| commit | b8106804c87f70c3be034dc3e191966293a8b877 (patch) | |
| tree | e07f7e11a28aa0eb028e0755431b84ec74ee6440 /src/quick/items/qquickevents.cpp | |
| parent | 071d45469cb2674d7ac6dd4ac50551dc97878526 (diff) | |
Move device id to be in bits 24-31 of the point id
This allows us for lossless conversion between QTouchEvent::TouchPoint id
and QQuickEventPoint::pointId (both ways).
Change-Id: I2087847a579dd8bc5b526515ad07b55c9ae8aa42
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickevents.cpp')
| -rw-r--r-- | src/quick/items/qquickevents.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp index c3156d0328..f4b203ac53 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.cpp @@ -642,7 +642,7 @@ QQuickPointerEvent *QQuickPointerMouseEvent::reset(QEvent *event) default: break; } - m_mousePoint->reset(state, ev->windowPos(), quint64(1) << 32, ev->timestamp()); // mouse has device ID 1 + m_mousePoint->reset(state, ev->windowPos(), quint64(1) << 24, ev->timestamp()); // mouse has device ID 1 return this; } |