diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-12-28 12:51:36 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-12-28 12:58:48 +0100 |
| commit | ae9e6d4ad7b7a67e90a16af432b55de5b3d7dbb5 (patch) | |
| tree | f37c6631d4b9854d1f3667622c132893a66e56f0 /src/quick/items/qquickevents.cpp | |
| parent | 3eeffae835b3474c8a3ca62125cb8ec24acdaa84 (diff) | |
| parent | 9a272ad1854d744ea57296ba633b9d0dc19d1625 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: Ib0be3797bfd07589ae177495173dc43c0133ca90
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 f8038ed11f..1fd9014408 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.cpp @@ -634,7 +634,7 @@ void QQuickEventTouchPoint::reset(const QTouchEvent::TouchPoint &tp, ulong times QQuickEventPoint::reset(tp.state(), tp.scenePos(), tp.id(), timestamp, tp.velocity()); m_rotation = tp.rotation(); m_pressure = tp.pressure(); -// m_uniqueId = tp.uniqueId(); + m_uniqueId = tp.uniqueId(); } /*! |