diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-03 03:04:33 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-03 03:04:33 +0100 |
| commit | 6847fe34373d9123c1ac35c9647567e5c2d46a5f (patch) | |
| tree | d945cb66ba4f6e56e3810d35f70224ab735dc6dc /src/imports | |
| parent | 435f478a3e80d9ed17691c85e584d7fc6a71c3b7 (diff) | |
| parent | 3aaa71792b6a30e12d1aaff66d7238770576b4cc (diff) | |
| download | qtlocation-6847fe34373d9123c1ac35c9647567e5c2d46a5f.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iea2f0f612ee83e3d7bd1dfed47de296f4cc34038
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/location/location.cpp | 4 | ||||
| -rw-r--r-- | src/imports/positioning/locationsingleton.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index 00f6454b..917ad25a 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -131,7 +131,7 @@ public: qmlRegisterType<QDeclarativePlaceUser >(uri, major, minor, "User"); qmlRegisterType<QDeclarativeRectangleMapItem >(uri, major, minor, "MapRectangle"); qmlRegisterType<QDeclarativeCircleMapItem >(uri, major, minor, "MapCircle"); - qmlRegisterType<QDeclarativeMapLineProperties>(); + qmlRegisterAnonymousType<QDeclarativeMapLineProperties >(uri, major); qmlRegisterType<QDeclarativePolylineMapItem >(uri, major, minor, "MapPolyline"); qmlRegisterType<QDeclarativePolygonMapItem >(uri, major, minor, "MapPolygon"); qmlRegisterType<QDeclarativeRouteMapItem >(uri, major, minor, "MapRoute"); @@ -177,7 +177,7 @@ public: // Register the 5.11 types minor = 11; - qmlRegisterType<QGeoMapObject>(); + qmlRegisterAnonymousType<QGeoMapObject>(uri, major); qmlRegisterType<QDeclarativeGeoManeuver, 11>(uri, major, minor, "RouteManeuver"); qmlRegisterType<QDeclarativeGeoMap, 11>(uri, major, minor, "Map"); qmlRegisterUncreatableType<QDeclarativeGeoMapItemBase, 11>(uri, major, minor, "GeoMapItemBase", diff --git a/src/imports/positioning/locationsingleton.cpp b/src/imports/positioning/locationsingleton.cpp index 5bc848f3..132c7a22 100644 --- a/src/imports/positioning/locationsingleton.cpp +++ b/src/imports/positioning/locationsingleton.cpp @@ -363,7 +363,7 @@ QGeoPolygon LocationSingleton::shapeToPolygon(const QGeoShape &shape) const /*! \qmlmethod coordinate QtPositioning::mercatorToCoord(point mercator) const - Converts a mercator coordinate into a latitude-longitude coordinate. + Converts a \a mercator coordinate into a latitude-longitude coordinate. \sa {coordToMercator} \since 5.12 |