diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-02-21 16:21:35 +0100 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-02-21 16:30:36 +0100 |
| commit | 21459a102cf0212bbfa6647a246ff8d6d64479ad (patch) | |
| tree | 0d528f3dcd0857d3688c811d30488e793a828138 /recipes-qt/qt5/qtlocation | |
| parent | f3e03753a0fc68dcf5b0fba2b37d4a1c7449758c (diff) | |
| parent | c31ab6c3d0d9198a958d388c3698c731ed8ad651 (diff) | |
Merge remote-tracking branch 'agl/next'
* agl/next:
packagegroup-agl-demo: replace udisks with udisk2
vboxguestdrivers: upgrade to 6.1.2
qtlocation: remove local patch
Declare layer compatibility with zeus
Change-Id: Iac02f582ee0808329b343f80666d74fc5385af90
Diffstat (limited to 'recipes-qt/qt5/qtlocation')
| -rw-r--r-- | recipes-qt/qt5/qtlocation/0001-Fix-unstable-rotation-gesture.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/recipes-qt/qt5/qtlocation/0001-Fix-unstable-rotation-gesture.patch b/recipes-qt/qt5/qtlocation/0001-Fix-unstable-rotation-gesture.patch deleted file mode 100644 index 164c9f0e5..000000000 --- a/recipes-qt/qt5/qtlocation/0001-Fix-unstable-rotation-gesture.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 85df79b094d1097108a28424d6f9b3b76b3aee62 Mon Sep 17 00:00:00 2001 -From: Tasuku Suzuki <tasuku.suzuki@qt.io> -Date: Thu, 8 Nov 2018 15:26:57 +0900 -Subject: [PATCH] Fix unstable rotation gesture - -Order of touch events are not sorted on some platform. When touch point -1 and -2 are swapped, map is rotated 180 degrees in a moment - -Change-Id: I9c308b805a6ca54519f26a9ff19217de7f947c17 -Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> ---- - src/location/declarativemaps/qquickgeomapgesturearea.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/location/declarativemaps/qquickgeomapgesturearea.cpp b/src/location/declarativemaps/qquickgeomapgesturearea.cpp -index c6f4b42..576aeee 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(); - --- -2.7.4 - |