diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-01-08 08:18:31 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-01-08 08:18:31 +0200 |
| commit | f1dd13632651a9efd0ea976a3efdd9c555a34bc2 (patch) | |
| tree | c647c2741ed1be32c8ad8dac6c962fc79bf17fe4 /src/location/declarativemaps/qquickgeomapgesturearea.cpp | |
| parent | 4ab5838d9ba26eef2b2156bbf9cd428547bbebe0 (diff) | |
| parent | 1688c44d223145abfdca19a7b31faecbafb0d315 (diff) | |
| download | qtlocation-f1dd13632651a9efd0ea976a3efdd9c555a34bc2.tar.gz | |
Merge 5.12 into 5.12.1
Change-Id: Ib65445a9e316252e7483d2878b8cdad252242177
Diffstat (limited to 'src/location/declarativemaps/qquickgeomapgesturearea.cpp')
| -rw-r--r-- | src/location/declarativemaps/qquickgeomapgesturearea.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/location/declarativemaps/qquickgeomapgesturearea.cpp b/src/location/declarativemaps/qquickgeomapgesturearea.cpp index b15dbc4d..88a766f5 100644 --- a/src/location/declarativemaps/qquickgeomapgesturearea.cpp +++ b/src/location/declarativemaps/qquickgeomapgesturearea.cpp @@ -1087,6 +1087,7 @@ void QQuickGeoMapGestureArea::update() m_allPoints << m_touchPoints; if (m_allPoints.isEmpty() && !m_mousePoint.isNull()) m_allPoints << *m_mousePoint.data(); + std::sort(m_allPoints.begin(), m_allPoints.end(), [](const QTouchEvent::TouchPoint &tp1, const QTouchEvent::TouchPoint &tp2) { return tp1.id() < tp2.id(); }); touchPointStateMachine(); |