Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	tests/auto/declarative_ui/tst_map.qml

Change-Id: If408b8242b39f78926b5373393f3b1f65b262499

1 files changed, 1 insertions, 114 deletions

diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
index 72c43a49..a97271aa 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
@@ -226,7 +226,7 @@ QList<QList<QDoubleVector2D> > QGeoMapPolylineGeometry::clipPath(const QGeoMap &
 
     // 2)
     QList<QList<QDoubleVector2D> > clippedPaths;
-    const QList<QDoubleVector2D> &visibleRegion = map.geoProjection().visibleRegion();
+    const QList<QDoubleVector2D> &visibleRegion = map.geoProjection().projectableRegion();
     if (visibleRegion.size()) {
         c2t::clip2tri clipper;
         clipper.addSubjectPath(QClipperUtils::qListToPath(wrappedPath), false);
@@ -337,120 +337,7 @@ void QGeoMapPolylineGeometry::updateSourcePoints(const QGeoMap &map,
 }
 
 ////////////////////////////////////////////////////////////////////////////
-#if 0 // Old polyline to viewport clipping code. Retaining it for now.
-/* Polyline clip */
-
-enum ClipPointType {
-    InsidePoint  = 0x00,
-    LeftPoint    = 0x01,
-    RightPoint   = 0x02,
-    BottomPoint  = 0x04,
-    TopPoint     = 0x08
-};
-
-static inline int clipPointType(qreal x, qreal y, const QRectF &rect)
-{
-    int type = InsidePoint;
-    if (x < rect.left())
-        type |= LeftPoint;
-    else if (x > rect.right())
-        type |= RightPoint;
-    if (y < rect.top())
-        type |= TopPoint;
-    else if (y > rect.bottom())
-        type |= BottomPoint;
-    return type;
-}
-
-static void clipSegmentToRect(qreal x0, qreal y0, qreal x1, qreal y1,
-                              const QRectF &clipRect,
-                              QVector<qreal> &outPoints,
-                              QVector<QPainterPath::ElementType> &outTypes)
-{
-    int type0 = clipPointType(x0, y0, clipRect);
-    int type1 = clipPointType(x1, y1, clipRect);
-    bool accept = false;
-
-    while (true) {
-        if (!(type0 | type1)) {
-            accept = true;
-            break;
-        } else if (type0 & type1) {
-            break;
-        } else {
-            qreal x = 0.0;
-            qreal y = 0.0;
-            int outsideType = type0 ? type0 : type1;
-
-            if (outsideType & BottomPoint) {
-                x = x0 + (x1 - x0) * (clipRect.bottom() - y0) / (y1 - y0);
-                y = clipRect.bottom() - 0.1;
-            } else if (outsideType & TopPoint) {
-                x = x0 + (x1 - x0) * (clipRect.top() - y0) / (y1 - y0);
-                y = clipRect.top() + 0.1;
-            } else if (outsideType & RightPoint) {
-                y = y0 + (y1 - y0) * (clipRect.right() - x0) / (x1 - x0);
-                x = clipRect.right() - 0.1;
-            } else if (outsideType & LeftPoint) {
-                y = y0 + (y1 - y0) * (clipRect.left() - x0) / (x1 - x0);
-                x = clipRect.left() + 0.1;
-            }
-
-            if (outsideType == type0) {
-                x0 = x;
-                y0 = y;
-                type0 = clipPointType(x0, y0, clipRect);
-            } else {
-                x1 = x;
-                y1 = y;
-                type1 = clipPointType(x1, y1, clipRect);
-            }
-        }
-    }
-
-    if (accept) {
-        if (outPoints.size() >= 2) {
-            qreal lastX, lastY;
-            lastY = outPoints.at(outPoints.size() - 1);
-            lastX = outPoints.at(outPoints.size() - 2);
-
-            if (!qFuzzyCompare(lastY, y0) || !qFuzzyCompare(lastX, x0)) {
-                outTypes << QPainterPath::MoveToElement;
-                outPoints << x0 << y0;
-            }
-        } else {
-            outTypes << QPainterPath::MoveToElement;
-            outPoints << x0 << y0;
-        }
-
-        outTypes << QPainterPath::LineToElement;
-        outPoints << x1 << y1;
-    }
-}
-
-static void clipPathToRect(const QVector<qreal> &points,
-                           const QVector<QPainterPath::ElementType> &types,
-                           const QRectF &clipRect,
-                           QVector<qreal> &outPoints,
-                           QVector<QPainterPath::ElementType> &outTypes)
-{
-    outPoints.clear();
-    outPoints.reserve(points.size());
-    outTypes.clear();
-    outTypes.reserve(types.size());
 
-    qreal lastX, lastY;
-    for (int i = 0; i < types.size(); ++i) {
-        if (i > 0 && types[i] != QPainterPath::MoveToElement) {
-            qreal x = points[i * 2], y = points[i * 2 + 1];
-            clipSegmentToRect(lastX, lastY, x, y, clipRect, outPoints, outTypes);
-        }
-
-        lastX = points[i * 2];
-        lastY = points[i * 2 + 1];
-    }
-}
-#endif
 /*!
     \internal
 */