From 54632e0ad52983df285f1d64d0d4ecb7b0f64260 Mon Sep 17 00:00:00 2001
From: Paolo Angelelli <paolo.angelelli@qt.io>
Date: Mon, 12 Feb 2018 10:42:06 +0100
Subject: [PATCH] Add override to
MapPolygonNode/MapPolylineNode::isSubtreeBlocked
Change-Id: I30ffbe559af8cf911a3525b578a875b5dab69c51
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
---
src/location/declarativemaps/qdeclarativepolygonmapitem_p.h | 2 +-
src/location/declarativemaps/qdeclarativepolylinemapitem_p.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
index c49495ab5..72bfd8564 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
@@ -148,7 +148,7 @@ public:
const QGeoMapItemGeometry *fillShape,
const QGeoMapItemGeometry *borderShape);
- bool isSubtreeBlocked() const;
+ bool isSubtreeBlocked() const override;
private:
QSGFlatColorMaterial fill_material_;
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
index 8a5c1122d..03fba6365 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
@@ -185,7 +185,7 @@ public:
~MapPolylineNode();
void update(const QColor &fillColor, const QGeoMapItemGeometry *shape);
- bool isSubtreeBlocked() const;
+ bool isSubtreeBlocked() const override;
private:
QSGFlatColorMaterial fill_material_;
--
GitLab