[SCM] qtlocation packaging branch, experimental, updated. debian/5.7.1-1-4-g4fd3fb8

[Simon Quigley]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtlocation.git;a=commitdiff;h=4fd3fb8

The following commit has been merged in the experimental branch:
commit 4fd3fb813774d5ff88884bc82f3687a509aba503
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Sat Jun 10 22:44:52 2017 -0500

    Add fix_qtdeclarative_private_code.patch for now
---
 .../patches/fix_qtdeclarative_private_code.patch   | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/fix_qtdeclarative_private_code.patch b/debian/patches/fix_qtdeclarative_private_code.patch
new file mode 100644
index 0000000..18af036
--- /dev/null
+++ b/debian/patches/fix_qtdeclarative_private_code.patch
@@ -0,0 +1,30 @@
+commit ccd098330f2be230733107c3c6b15e05771f7150
+Author: Simon Quigley <tsimonq2 at ubuntu.com>
+Date:   Sat Jun 10 22:23:08 2017 -0500
+
+    Revert "Fix compile due to change in private API in qtdeclarative"
+
+    This patch should only be in the packaging until qtdeclarative final
+    gets out of the NEW queue.
+
+diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp
+index 9f4dae3f..45d84470 100644
+--- a/src/location/declarativemaps/qdeclarativegeomap.cpp
++++ b/src/location/declarativemaps/qdeclarativegeomap.cpp
+@@ -2139,12 +2139,11 @@ bool QDeclarativeGeoMap::sendMouseEvent(QMouseEvent *event)
+
+ bool QDeclarativeGeoMap::sendTouchEvent(QTouchEvent *event)
+ {
+-    QQuickPointerDevice *touchDevice = QQuickPointerDevice::touchDevice(event->device());
++    const QQuickPointerDevice *touchDevice = QQuickPointerDevice::touchDevice(event->device());
+     const QTouchEvent::TouchPoint &point = event->touchPoints().first();
+-    QQuickWindowPrivate *windowPriv = QQuickWindowPrivate::get(window());
+
+-    auto touchPointGrabberItem = [touchDevice, windowPriv](const QTouchEvent::TouchPoint &point) -> QQuickItem* {
+-        if (QQuickEventPoint *eventPointer = windowPriv->pointerEventInstance(touchDevice)->pointById(point.id()))
++    auto touchPointGrabberItem = [touchDevice](const QTouchEvent::TouchPoint &point) -> QQuickItem* {
++        if (QQuickEventPoint *eventPointer = touchDevice->pointerEvent()->pointById(point.id()))
+             return eventPointer->grabber();
+         return nullptr;
+     };
+
diff --git a/debian/patches/series b/debian/patches/series
index 726d5ba..3c9a2e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable_failing_tests.patch
+fix_qtdeclarative_private_code.patch

-- 
qtlocation packaging