From ec8152a98b8971af6020dbee5a2885a525a53f88 Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Fri, 29 Jun 2018 11:05:21 +0200 Subject: Fix return type of LocationSingleton::polygon Previously returning QGeoPath Change-Id: Id4de95918038d5efeefbd44034265f3a3a34d9fa Reviewed-by: Simon Hausmann --- src/imports/positioning/locationsingleton.cpp | 4 ++-- 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 89b93617..35b0d8d9 100644 --- a/src/imports/positioning/locationsingleton.cpp +++ b/src/imports/positioning/locationsingleton.cpp @@ -241,7 +241,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(); } @@ -254,7 +254,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 internalCoordinates; for (int i = 0; i < coordinates.size(); i++) { diff --git a/src/imports/positioning/locationsingleton.h b/src/imports/positioning/locationsingleton.h index 6a560fa8..56d35b70 100644 --- a/src/imports/positioning/locationsingleton.h +++ b/src/imports/positioning/locationsingleton.h @@ -77,8 +77,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; -- cgit v1.2.1