diff options
author | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-11-18 18:37:44 +0100 |
---|---|---|
committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2015-11-23 12:34:32 +0000 |
commit | 775dc837ecc5cd71a34cb8b87225a9196df7cff1 (patch) | |
tree | 93666d00050b537f96b1a10a4d3d48e5e7e1bd31 | |
parent | 384991d3dca08725b6805c5cae1d206238f131c7 (diff) | |
download | qtlocation-775dc837ecc5cd71a34cb8b87225a9196df7cff1.tar.gz |
Remove toScreenPosition from map qml api
Remove already deprecated toScreenPosition reference
Change-Id: I64f0f621599067807f0d467c689f6ef0409a17ea
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
-rw-r--r-- | src/imports/location/qdeclarativegeomap.cpp | 12 | ||||
-rw-r--r-- | src/imports/location/qdeclarativegeomap_p.h | 4 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index 06d6ad91..117641ce 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -877,18 +877,6 @@ QPointF QDeclarativeGeoMap::fromCoordinate(const QGeoCoordinate &coordinate, boo } /*! - \qmlmethod QtLocation::Map::toScreenPosition(coordinate coordinate) - \obsolete - - This function is missed named and is equilavent to \l {fromCoordinate}, which should be used - instead. -*/ -QPointF QDeclarativeGeoMap::toScreenPosition(const QGeoCoordinate &coordinate) const -{ - return fromCoordinate(coordinate); -} - -/*! \qmlmethod void QtLocation::Map::pan(int dx, int dy) Starts panning the map by \a dx pixels along the x-axis and diff --git a/src/imports/location/qdeclarativegeomap_p.h b/src/imports/location/qdeclarativegeomap_p.h index 47a6fe0b..acfdd4f5 100644 --- a/src/imports/location/qdeclarativegeomap_p.h +++ b/src/imports/location/qdeclarativegeomap_p.h @@ -122,10 +122,6 @@ public: Q_INVOKABLE QGeoCoordinate toCoordinate(const QPointF &position, bool clipToViewPort = true) const; Q_INVOKABLE QPointF fromCoordinate(const QGeoCoordinate &coordinate, bool clipToViewPort = true) const; -#if QT_DEPRECATED_SINCE(5,5) - QT_DEPRECATED Q_INVOKABLE QPointF toScreenPosition(const QGeoCoordinate &coordinate) const; -#endif - QQuickGeoMapGestureArea *gesture(); Q_INVOKABLE void fitViewportToGeoShape(const QVariant &shape); |