diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 09:20:40 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 09:20:40 +0100 |
| commit | baa6f08e1ea7c2f3ae04fee475f75a5d1593b542 (patch) | |
| tree | 97ad425bb42e425d366990f310be7e392093557a /src/positioning | |
| parent | cfb917948799cb177b3de7eced77f37d13b4e520 (diff) | |
| parent | dc761b9007416b254eba18a300c5d7f91ca1c552 (diff) | |
| download | qtlocation-baa6f08e1ea7c2f3ae04fee475f75a5d1593b542.tar.gz | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I53b052e12532392192d73da7006b204539cad57c
Diffstat (limited to 'src/positioning')
| -rw-r--r-- | src/positioning/qgeopath.cpp | 2 | ||||
| -rw-r--r-- | src/positioning/qgeopath.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/positioning/qgeopath.cpp b/src/positioning/qgeopath.cpp index beb43692..0c3d0c1c 100644 --- a/src/positioning/qgeopath.cpp +++ b/src/positioning/qgeopath.cpp @@ -204,7 +204,7 @@ const QList<QGeoCoordinate> &QGeoPath::path() const \since 5.12 */ -void QGeoPath::clear() +void QGeoPath::clearPath() { Q_D(QGeoPath); d->clearPath(); diff --git a/src/positioning/qgeopath.h b/src/positioning/qgeopath.h index cda6f277..e4af2add 100644 --- a/src/positioning/qgeopath.h +++ b/src/positioning/qgeopath.h @@ -72,7 +72,7 @@ public: void setPath(const QList<QGeoCoordinate> &path); const QList<QGeoCoordinate> &path() const; - void clear(); + void clearPath(); void setVariantPath(const QVariantList &path); QVariantList variantPath() const; |