diff options
author | Liang Qi <liang.qi@qt.io> | 2018-12-10 15:55:26 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-12-10 15:55:26 +0100 |
commit | f364284e2a7e52bf31eb6ed7fbaff1e7c43ebee6 (patch) | |
tree | 431c875c7b59dfe00996d8f7099d3b34ef1df3be /src/positioning | |
parent | 41e1fb33ab89a2b00927677cfec09ba6cf22e29d (diff) | |
parent | b4966afc91fa82315f0ae9b11f54f52f20183e9b (diff) | |
download | qtlocation-f364284e2a7e52bf31eb6ed7fbaff1e7c43ebee6.tar.gz |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I00453b819d65460dabf771617e6181275461cc78
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; |