diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-03 15:33:16 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-03 15:33:16 +0200 |
| commit | 7945d234e1dade6f0381c019f0398943d176ad55 (patch) | |
| tree | 6aade73f4991cdc778afc83cfa9176f88309d656 /src/location/declarativemaps/qdeclarativegeomap.cpp | |
| parent | b9a3306bb9dd89155ca33bdb4d42675fc69aa26b (diff) | |
| parent | 90defc33dceb341aa8dac03c0511b1ef2a20c6c2 (diff) | |
| download | qtlocation-7945d234e1dade6f0381c019f0398943d176ad55.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I46ebc392ac3f5da89bc9957113247dd18d682fc1
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeomap.cpp')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeomap.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp index f9bf5805..4704dc3e 100644 --- a/src/location/declarativemaps/qdeclarativegeomap.cpp +++ b/src/location/declarativemaps/qdeclarativegeomap.cpp @@ -1518,7 +1518,7 @@ void QDeclarativeGeoMap::alignCoordinateToPoint(const QGeoCoordinate &coordinate Returns the coordinate which corresponds to the \a position relative to the map item. - If \a cliptoViewPort is \c true, or not supplied then returns an invalid coordinate if + If \a clipToViewPort is \c true, or not supplied then returns an invalid coordinate if \a position is not within the current viewport. */ QGeoCoordinate QDeclarativeGeoMap::toCoordinate(const QPointF &position, bool clipToViewPort) const @@ -1534,7 +1534,7 @@ QGeoCoordinate QDeclarativeGeoMap::toCoordinate(const QPointF &position, bool cl Returns the position relative to the map item which corresponds to the \a coordinate. - If \a cliptoViewPort is \c true, or not supplied then returns an invalid QPointF if + If \a clipToViewPort is \c true, or not supplied then returns an invalid QPointF if \a coordinate is not within the current viewport. */ QPointF QDeclarativeGeoMap::fromCoordinate(const QGeoCoordinate &coordinate, bool clipToViewPort) const @@ -1598,8 +1598,8 @@ void QDeclarativeGeoMap::clearData() /*! \qmlmethod void QtLocation::Map::fitViewportToGeoShape(geoShape, margins) - Fits the viewport to a specific geo shape. - The margins are in screen pixels. + Fits the viewport to a specific geo shape \a geoShape. + The \a margins are in screen pixels. \note If the projection used by the plugin is not WebMercator, and the plugin does not have fitting to shape capability, this method will do nothing. @@ -1776,7 +1776,7 @@ void QDeclarativeGeoMap::onCameraDataChanged(const QGeoCameraData &cameraData) /*! \qmlmethod void QtLocation::Map::addMapParameter(MapParameter parameter) - Adds a MapParameter object to the map. The effect of this call is dependent + Adds the \a parameter object to the map. The effect of this call is dependent on the combination of the content of the MapParameter and the type of underlying QGeoMap. If a MapParameter that is not supported by the underlying QGeoMap gets added, the call has no effect. @@ -1806,7 +1806,7 @@ void QDeclarativeGeoMap::addMapParameter(QDeclarativeGeoMapParameter *parameter) /*! \qmlmethod void QtLocation::Map::removeMapParameter(MapParameter parameter) - Removes the given MapParameter object from the map. + Removes the given \a parameter object from the map. The release of this API with Qt 5.9 is a Technology Preview. |