diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-07 03:00:18 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-07 03:00:18 +0200 |
| commit | 896f208cdc2ef6665a61796f599c02052c81655a (patch) | |
| tree | b637cf47d589585dd6fde4fcf9382d4a32d1ea66 /src/imports | |
| parent | f8df5799b68fcb8690462b6dce226e6ce9bac282 (diff) | |
| parent | b0c601ae487575bbed28ed0590aafe69682b28c8 (diff) | |
| download | qtlocation-896f208cdc2ef6665a61796f599c02052c81655a.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib9f54662206dd80389fa211cf650eb3599938fbb
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/positioning/locationsingleton.cpp | 4 | ||||
| -rw-r--r-- | src/imports/positioning/locationsingleton.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/positioning/locationsingleton.cpp b/src/imports/positioning/locationsingleton.cpp index ea70d47f..209a289b 100644 --- a/src/imports/positioning/locationsingleton.cpp +++ b/src/imports/positioning/locationsingleton.cpp @@ -243,7 +243,7 @@ QGeoPath LocationSingleton::path(const QJSValue &value, qreal width) const \sa {geopolygon} \since 5.10 */ -QGeoPath LocationSingleton::polygon() const +QGeoPolygon LocationSingleton::polygon() const { return QGeoPolygon(); } @@ -256,7 +256,7 @@ QGeoPath LocationSingleton::polygon() const \sa {geopolygon} \since 5.10 */ -QGeoPath LocationSingleton::polygon(const QVariantList &coordinates) const +QGeoPolygon LocationSingleton::polygon(const QVariantList &coordinates) const { QList<QGeoCoordinate> internalCoordinates; for (int i = 0; i < coordinates.size(); i++) { diff --git a/src/imports/positioning/locationsingleton.h b/src/imports/positioning/locationsingleton.h index 92e03f1b..a70332ec 100644 --- a/src/imports/positioning/locationsingleton.h +++ b/src/imports/positioning/locationsingleton.h @@ -78,8 +78,8 @@ public: Q_INVOKABLE QGeoPath path() const; Q_INVOKABLE QGeoPath path(const QJSValue &value, qreal width = 0.0) const; - Q_INVOKABLE QGeoPath polygon() const; - Q_INVOKABLE QGeoPath polygon(const QVariantList &value) const; + Q_INVOKABLE QGeoPolygon polygon() const; + Q_INVOKABLE QGeoPolygon polygon(const QVariantList &value) const; Q_INVOKABLE QGeoCircle shapeToCircle(const QGeoShape &shape) const; Q_INVOKABLE QGeoRectangle shapeToRectangle(const QGeoShape &shape) const; |