From e82c41d35ddd6ef0d14e1d01ea1dfd46742bc0fe Mon Sep 17 00:00:00 2001
From: Paolo Angelelli <paolo.angelelli.qt@gmail.com>
Date: Thu, 26 Dec 2019 21:31:03 +0100
Subject: 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>
---
 src/location/labs/qsg/qgeomapobjectqsgsupport_p.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/location/labs/qsg/qgeomapobjectqsgsupport_p.h')

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
-- 
cgit v1.2.1