diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:06:36 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:06:36 +0200 |
| commit | ec4a814f0dbc8811c1a1061c44bc1e6bfcc55efc (patch) | |
| tree | 40454a87488727f0cdfddb8080d9230b0a799a56 /src/imports | |
| parent | 6b5b03c17008fd93e8e152f7e46f1bafe6568018 (diff) | |
| parent | 118dac89625a8f713bb12e7e9f30bc37b10754b7 (diff) | |
| download | qtlocation-ec4a814f0dbc8811c1a1061c44bc1e6bfcc55efc.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: Id543d32c49c8efd1d7798d41bbee0e28c1742e12
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/positioning/locationsingleton.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/imports/positioning/locationsingleton.cpp b/src/imports/positioning/locationsingleton.cpp index 8f810d94..5bc848f3 100644 --- a/src/imports/positioning/locationsingleton.cpp +++ b/src/imports/positioning/locationsingleton.cpp @@ -97,7 +97,7 @@ QGeoCoordinate LocationSingleton::coordinate() const } /*! - \qmlmethod coordinate QtPositioning::coordinate(real latitude, real longitue, real altitude) const + \qmlmethod coordinate QtPositioning::coordinate(real latitude, real longitude, real altitude) const Constructs a coordinate with the specified \a latitude, \a longitude and optional \a altitude. Both \a latitude and \a longitude must be valid, otherwise an invalid coordinate is returned. @@ -151,7 +151,7 @@ QGeoRectangle LocationSingleton::rectangle(const QGeoCoordinate ¢er, \qmlmethod georectangle QtPositioning::rectangle(coordinate topLeft, coordinate bottomRight) const Constructs a georectangle with its top left corner positioned at \a topLeft and its bottom - right corner positioned at \a {bottomLeft}. + right corner positioned at \a {bottomRight}. \sa {georectangle} */ @@ -376,8 +376,7 @@ QGeoCoordinate LocationSingleton::mercatorToCoord(const QPointF &mercator) const /*! \qmlmethod point QtPositioning::coordToMercator(coordinate coord) const - Converts a coordinate into a mercator coordinate. - + Converts a coordinate \a coord into a mercator coordinate and returns it. \sa {mercatorToCoord} \since 5.12 */ |