Merge remote-tracking branch 'origin/5.11.0' into 5.11

Change-Id: I0bb00d16c891856cfbe1042ce166bbd156e9f41b

1 files changed, 23 insertions, 4 deletions

diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
index ca01de12..225f21d9 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
@@ -181,20 +181,39 @@ private:
 
 //////////////////////////////////////////////////////////////////////
 
-class Q_LOCATION_PRIVATE_EXPORT MapPolylineNode : public QSGGeometryNode
+class Q_LOCATION_PRIVATE_EXPORT VisibleNode
 {
+public:
+    VisibleNode();
+    virtual ~VisibleNode();
+
+    bool subtreeBlocked() const;
+    void setSubtreeBlocked(bool blocked);
+    bool visible() const;
+    void setVisible(bool visible);
+
+    bool m_blocked : 1;
+    bool m_visible : 1;
+};
 
+class Q_LOCATION_PRIVATE_EXPORT MapItemGeometryNode : public QSGGeometryNode, public VisibleNode
+{
+public:
+    ~MapItemGeometryNode() override;
+    bool isSubtreeBlocked() const override;
+};
+
+class Q_LOCATION_PRIVATE_EXPORT MapPolylineNode : public MapItemGeometryNode
+{
 public:
     MapPolylineNode();
-    ~MapPolylineNode();
+    ~MapPolylineNode() override;
 
     void update(const QColor &fillColor, const QGeoMapItemGeometry *shape);
-    bool isSubtreeBlocked() const override;
 
 private:
     QSGFlatColorMaterial fill_material_;
     QSGGeometry geometry_;
-    bool blocked_;
 };
 
 QT_END_NAMESPACE