diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-02-02 12:15:06 +0200 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-02-14 13:18:12 +0000 |
| commit | 5e6bc0bb6daca66927333ad2195fa73ca5d765e8 (patch) | |
| tree | f2b5a6699e6a88fadb7d31c482002f67a8ce0c90 /src/location/declarativemaps | |
| parent | 632f5735d055129067d12ea7d6cd33ebd560aa3b (diff) | |
| download | qtlocation-5e6bc0bb6daca66927333ad2195fa73ca5d765e8.tar.gz | |
Support for Mapbox GL Native rendering of QML Map{Polygon,Polyline} items
Replaces Mapbox GL Native annotations with runtime styles API.
Missing:
- Map{Polygon,Rectangle} border width property - see QTBUG-58872 for details.
- MapCircle support - see QTBUG-58869 for detais.
Change-Id: I77c9daee813a63efc60104f94f440f00ac3cf70f
Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com>
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/location/declarativemaps')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp index 369ca986..89b139c8 100644 --- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp +++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp @@ -315,7 +315,7 @@ static void calculatePeripheralPoints(QList<QGeoCoordinate> &path, } QDeclarativeCircleMapItem::QDeclarativeCircleMapItem(QQuickItem *parent) -: QDeclarativeGeoMapItemBase(parent), color_(Qt::transparent), dirtyMaterial_(true), +: QDeclarativeGeoMapItemBase(parent), border_(this), color_(Qt::transparent), dirtyMaterial_(true), updatingGeometry_(false) { setFlag(ItemHasContents, true); diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp index ff6e58fc..857aec41 100644 --- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp +++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp @@ -331,7 +331,7 @@ void QGeoMapPolygonGeometry::updateScreenPoints(const QGeoMap &map) } QDeclarativePolygonMapItem::QDeclarativePolygonMapItem(QQuickItem *parent) -: QDeclarativeGeoMapItemBase(parent), color_(Qt::transparent), dirtyMaterial_(true), +: QDeclarativeGeoMapItemBase(parent), border_(this), color_(Qt::transparent), dirtyMaterial_(true), updatingGeometry_(false) { setFlag(ItemHasContents, true); diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp index 03f7f846..1bfbf1fd 100644 --- a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp +++ b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp @@ -114,7 +114,7 @@ QT_BEGIN_NAMESPACE */ QDeclarativeRectangleMapItem::QDeclarativeRectangleMapItem(QQuickItem *parent) -: QDeclarativeGeoMapItemBase(parent), color_(Qt::transparent), dirtyMaterial_(true), +: QDeclarativeGeoMapItemBase(parent), border_(this), color_(Qt::transparent), dirtyMaterial_(true), updatingGeometry_(false) { setFlag(ItemHasContents, true); |