diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-27 03:03:41 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-27 03:03:41 +0200 |
| commit | 1c61d6de77657d60814d582153e75ace6597dde7 (patch) | |
| tree | 571eebabfccf1cc6e0774682b6e2ef608983b521 /src | |
| parent | 5c53cd23351a1850f170dcf2fdcab7545cac3ddc (diff) | |
| parent | 5d357f90951dde3cbae943dfa8ee44e0b952956d (diff) | |
| download | qtlocation-1c61d6de77657d60814d582153e75ace6597dde7.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I46962833cb56c4004df9410fe59dbd34fee5c2b0
Diffstat (limited to 'src')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeomapitemview.cpp | 6 | ||||
| -rw-r--r-- | src/location/doc/src/plugins/mapboxgl.qdoc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp index 3208829c..f7a251a2 100644 --- a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp +++ b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp @@ -140,17 +140,17 @@ void QDeclarativeGeoMapItemView::classBegin() // connect(m_delegateModel, &QQmlInstanceModel::initItem, this, &QDeclarativeGeoMapItemView::initItem); } -void QDeclarativeGeoMapItemView::destroyingItem(QObject */*object*/) +void QDeclarativeGeoMapItemView::destroyingItem(QObject * /*object*/) { } -void QDeclarativeGeoMapItemView::initItem(int /*index*/, QObject */*object*/) +void QDeclarativeGeoMapItemView::initItem(int /*index*/, QObject * /*object*/) { } -void QDeclarativeGeoMapItemView::createdItem(int index, QObject */*object*/) +void QDeclarativeGeoMapItemView::createdItem(int index, QObject * /*object*/) { if (!m_map) return; diff --git a/src/location/doc/src/plugins/mapboxgl.qdoc b/src/location/doc/src/plugins/mapboxgl.qdoc index b1d721bf..c5e02810 100644 --- a/src/location/doc/src/plugins/mapboxgl.qdoc +++ b/src/location/doc/src/plugins/mapboxgl.qdoc @@ -180,8 +180,8 @@ replacing the dash with camel case for technical reasons (i.e. \b line-cap will \li source \li A style data \l {https://www.mapbox.com/mapbox-gl-js/style-spec/#sources}{source}. When using a source of \b sourceType \l {https://www.mapbox.com/mapbox-gl-js/style-spec/#sources-geojson}{geojson}, the - \b data property can be both inlined or sourced from qrc. - \li Supported source types are: \b vector, \b raster, \b raster-dem and \b geojson. + \b data property can be both inlined or sourced from qrc. Supported source types are: \b vector, \b raster, + \b raster-dem and \b geojson. 'geojson'. \row \li layer |