summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-29 03:06:42 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-29 03:06:42 +0100
commit0a074c7164f562417b2667c175d4e20d63415b48 (patch)
tree46c6707e21be8eab9b9a925e62d8ede2957ef8a3
parentec3001c3490b14de3b242dce6af97ec519433305 (diff)
parent07de1d0f0f93b742434e2fcfda70bf70cb6373c9 (diff)
downloadqtlocation-0a074c7164f562417b2667c175d4e20d63415b48.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta2
Change-Id: I66502770edaa22deb2644ce5071df4894c4d0f97
-rw-r--r--src/location/declarativemaps/qdeclarativepolylinemapitem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
index d40c1b79..d59704dc 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
@@ -1010,7 +1010,7 @@ void QDeclarativePolylineMapItem::setPath(const QJSValue &value)
}
/*!
- \qmlmethod int MapPolyline::setPath(geopath path)
+ \qmlmethod void MapPolyline::setPath(geopath path)
Sets the \a path using a geopath type.