diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-05 03:03:57 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-05 03:03:57 +0200 |
commit | b44858e1e78820ce1139ee656a1892fb12c4799c (patch) | |
tree | 25a549413e57e096caa1b3a3b8240c4c91e8d5ec /src/positioning/qgeopolygon.cpp | |
parent | efdf3c266dce8791b78d1a851b16d2f4dbe8534e (diff) | |
parent | 25a220dd7370acdf04ee8f6d2d59f25d81cf42c7 (diff) | |
download | qtlocation-b44858e1e78820ce1139ee656a1892fb12c4799c.tar.gz |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I219a1353a21d29177e0cd7f21d64c06a8f28fced
Diffstat (limited to 'src/positioning/qgeopolygon.cpp')
-rw-r--r-- | src/positioning/qgeopolygon.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/positioning/qgeopolygon.cpp b/src/positioning/qgeopolygon.cpp index 4e902be5..04e09095 100644 --- a/src/positioning/qgeopolygon.cpp +++ b/src/positioning/qgeopolygon.cpp @@ -117,7 +117,8 @@ QGeoPolygon::QGeoPolygon() } /*! - Constructs a new geo \a polygon from a list of coordinates. + Constructs a new geo \a polygon from the coordinates specified + in \a path. */ QGeoPolygon::QGeoPolygon(const QList<QGeoCoordinate> &path) : QGeoShape(new QGeoPolygonPrivate(path)) @@ -178,7 +179,7 @@ bool QGeoPolygon::operator!=(const QGeoPolygon &other) const } /*! - Sets the \a polygon's boundary from a list of coordinates. + Sets the \a path for the polygon. */ void QGeoPolygon::setPath(const QList<QGeoCoordinate> &path) { @@ -196,7 +197,9 @@ const QList<QGeoCoordinate> &QGeoPolygon::path() const } /*! - Sets all the elements of the polygon's perimeter. + Sets all the elements of the polygon's perimeter + based on a list of coordinates (\a path). +. \since QtPositioning 5.12 */ @@ -355,7 +358,8 @@ QString QGeoPolygon::toString() const } /*! - Sets the \a path for a hole inside the polygon. The hole is a QVariant containing a QList<QGeoCoordinate>. + Sets the \a holePath for a hole inside the polygon. The hole is a + QVariant containing a QList<QGeoCoordinate>. \since 5.12 */ @@ -375,7 +379,7 @@ void QGeoPolygon::addHole(const QVariant &holePath) } /*! - Overloaded method. Sets the \a path for a hole inside the polygon. The hole is a QList<QGeoCoordinate>. + Overloaded method. Sets the \a holePath for a hole inside the polygon. The hole is a QList<QGeoCoordinate>. \since 5.12 */ @@ -386,7 +390,8 @@ void QGeoPolygon::addHole(const QList<QGeoCoordinate> &holePath) } /*! - Returns a QVariant containing a QVariant containing a QList<QGeoCoordinate> which represents the hole at index. + Returns a QVariant containing a QVariant containing a QList<QGeoCoordinate> + which represents the hole at \a index. \since 5.12 */ |