diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-10 13:20:09 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-10 13:20:09 +0100 |
| commit | b4966afc91fa82315f0ae9b11f54f52f20183e9b (patch) | |
| tree | 982cc9c73dbec9af725eaecca9cd7d6986e59c65 /src/location/declarativemaps/qdeclarativepolygonmapitem_p.h | |
| parent | 3d38d96c44d376a10cbe140f7b7c6866bd203471 (diff) | |
| parent | de6da4d9a94d35ecb05dd69b188f795a5afd577c (diff) | |
| download | qtlocation-b4966afc91fa82315f0ae9b11f54f52f20183e9b.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: Ifd3514a958d0df4320b253c26e3da3a632088be8
Diffstat (limited to 'src/location/declarativemaps/qdeclarativepolygonmapitem_p.h')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativepolygonmapitem_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h index a68b6315..87d72307 100644 --- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h +++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h @@ -120,7 +120,6 @@ protected: protected Q_SLOTS: void markSourceDirtyAndUpdate(); - void handleBorderUpdated(); virtual void afterViewportChanged(const QGeoMapViewportChangeEvent &event) override; private: |