diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-05-04 11:13:36 +0200 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-05-04 11:13:45 +0200 |
commit | d0166d20086086fc5c4a8e437ed83fd389ee8643 (patch) | |
tree | 1928c60e483465d4ef8218c801a008afedba99b7 /src/location/labs/qsg/qmappolylineobjectqsg_p_p.h | |
parent | d44838125389720e4352dd51ad1da02f4cb58dc8 (diff) | |
parent | 139414573ab27bd1df1b491aeb6003a6fc0d3d5d (diff) | |
download | qtlocation-d0166d20086086fc5c4a8e437ed83fd389ee8643.tar.gz |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: I0bb00d16c891856cfbe1042ce166bbd156e9f41b
Diffstat (limited to 'src/location/labs/qsg/qmappolylineobjectqsg_p_p.h')
-rw-r--r-- | src/location/labs/qsg/qmappolylineobjectqsg_p_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/location/labs/qsg/qmappolylineobjectqsg_p_p.h b/src/location/labs/qsg/qmappolylineobjectqsg_p_p.h index 52b5e89a..792413e5 100644 --- a/src/location/labs/qsg/qmappolylineobjectqsg_p_p.h +++ b/src/location/labs/qsg/qmappolylineobjectqsg_p_p.h @@ -68,7 +68,10 @@ public: // QQSGMapObject void updateGeometry() override; - QSGNode *updateMapObjectNode(QSGNode *oldNode, QSGNode *root, QQuickWindow *window) override; + QSGNode *updateMapObjectNode(QSGNode *oldNode, + VisibleNode **visibleNode, + QSGNode *root, + QQuickWindow *window) override; // QGeoMapPolylinePrivate interface QList<QGeoCoordinate> path() const override; |