Merge 5.14 into 5.14.0

Change-Id: Id2e7b0a3d3ecefdee377094fa10a1bea4a71d06c

1 files changed, 2 insertions, 2 deletions

diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 40dffd5d..fd53ad7a 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",