diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-25 18:28:32 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-25 18:35:38 +0100 |
| commit | 9a272ad1854d744ea57296ba633b9d0dc19d1625 (patch) | |
| tree | 096752ec339e18998517a4598f907e4b42b9403d /src/quick/items/qquickevents.cpp | |
| parent | 70c6b9639c53d2a530ccabd1395f561211c16fa4 (diff) | |
| parent | d8a052bc6b0349045db3d43a373b09cb16b41a48 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
tools/qmlimportscanner/main.cpp
Change-Id: I01e17581f6691a03f83788773364d0cf96319514
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 42588fd058..2fad9f5a8d 100644 --- a/src/quick/items/qquickevents.cpp +++ b/src/quick/items/qquickevents.cpp @@ -552,7 +552,7 @@ void QQuickEventTouchPoint::reset(const QTouchEvent::TouchPoint &tp, ulong times QQuickEventPoint::reset(tp.state(), tp.scenePos(), tp.id(), timestamp); m_rotation = tp.rotation(); m_pressure = tp.pressure(); -// m_uniqueId = tp.uniqueId(); + m_uniqueId = tp.uniqueId(); } /*! |