diff options
| author | Paolo Angelelli <paolo.angelelli.qt@gmail.com> | 2019-12-26 21:31:03 +0100 |
|---|---|---|
| committer | paolo <paolo.angelelli.qt@gmail.com> | 2020-02-11 19:35:27 +0100 |
| commit | e82c41d35ddd6ef0d14e1d01ea1dfd46742bc0fe (patch) | |
| tree | 17772318d8b51e3eb4bc19dc3d5fee120c137a90 /src/location/labs/qsg/qgeomapobjectqsgsupport_p.h | |
| parent | d055098540df99a5d426360e9322c659e678e5ee (diff) | |
| download | qtlocation-e82c41d35ddd6ef0d14e1d01ea1dfd46742bc0fe.tar.gz | |
Fix Map*ObjectsQSG implementation triggering QSGBatchRenderer crashes
The new approach introduces a root node for all objects, that is
repopulated at every repaint.
Change-Id: I4562e1aaa18999a03e8c38fe3bf59fe41f14dd70
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/location/labs/qsg/qgeomapobjectqsgsupport_p.h')
| -rw-r--r-- | src/location/labs/qsg/qgeomapobjectqsgsupport_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h b/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h index bb0477c5..1ec966fa 100644 --- a/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h +++ b/src/location/labs/qsg/qgeomapobjectqsgsupport_p.h @@ -57,10 +57,10 @@ #include <QtLocation/private/qmaprouteobjectqsg_p_p.h> #include <QtLocation/private/qmapiconobjectqsg_p_p.h> #include <QtLocation/private/qdeclarativepolylinemapitem_p.h> +#include <QtLocation/private/qdeclarativepolygonmapitem_p_p.h> #include <QtCore/qpointer.h> QT_BEGIN_NAMESPACE - struct Q_LOCATION_PRIVATE_EXPORT MapObject { MapObject(QPointer<QGeoMapObject> &o, QQSGMapObject *sgo) : object(o), sgObject(sgo) {} @@ -85,6 +85,7 @@ public: QList<MapObject> m_pendingMapObjects; QList<MapObject> m_removedMapObjects; QGeoMap *m_map = nullptr; + QDeclarativePolygonMapItemPrivateOpenGL::RootNode *m_mapObjectsRootNode = nullptr; }; QT_END_NAMESPACE |