diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-04-17 13:50:12 +0200 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-04-19 11:46:04 +0000 |
commit | 2a5a2dd5495ca899dfb60eb219ab9fd41a2a25fc (patch) | |
tree | 0593dc48a6851bfe5143d07c3e1019757783b4f2 /src/location/declarativemaps | |
parent | be8b7b6d62203f3d9749a6420cf3260f8be8f7fc (diff) | |
download | qtlocation-2a5a2dd5495ca899dfb60eb219ab9fd41a2a25fc.tar.gz |
Remove dead code in QGeoMapPolylineGeometry::updateScreenPoints
QTriangulatingStroker does apparently not use the clip argument, so
the patch removes the code that calculates it.
Change-Id: I14eeb2e7aac38e3f066d4d33c68ceae63555944d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/location/declarativemaps')
-rw-r--r-- | src/location/declarativemaps/qdeclarativepolylinemapitem.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp index 2568f8ac..dffec4d5 100644 --- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp +++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp @@ -532,20 +532,14 @@ void QGeoMapPolylineGeometry::updateScreenPoints(const QGeoMap &map, return; } - // Create the viewport rect in the same coordinate system - // as the actual points - QRectF viewport(0, 0, map.viewportWidth(), map.viewportHeight()); - viewport.adjust(-strokeWidth, -strokeWidth, strokeWidth, strokeWidth); - viewport.translate(-1 * origin); - // The geometry has already been clipped against the visible region projection in wrapped mercator space. QVector<qreal> points = srcPoints_; QVector<QPainterPath::ElementType> types = srcPointTypes_; QVectorPath vp(points.data(), types.size(), types.data()); QTriangulatingStroker ts; - // viewport is not used in the call below. - ts.process(vp, QPen(QBrush(Qt::black), strokeWidth), viewport, QPainter::Qt4CompatiblePainting); + // As of Qt5.11, the clip argument is not actually used, in the call below. + ts.process(vp, QPen(QBrush(Qt::black), strokeWidth), QRectF(), QPainter::Qt4CompatiblePainting); clear(); |