summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@qt.io>2019-03-25 11:09:35 +0100
committerAlex Blasche <alexander.blasche@qt.io>2019-03-25 15:28:30 +0000
commit5389a65dc7434c4ed269a5d0c5cb93f5b12823ba (patch)
treef6dd2ebf77c0554aaeb189b00d3ed40e5e6e2375
parent6365030928d3562258932647d3ade81d0a890137 (diff)
downloadqtlocation-5389a65dc7434c4ed269a5d0c5cb93f5b12823ba.tar.gz
Update Location QML imports
the changed attributes should have a matching meta object export. Change-Id: I35cd3d5fabe1c4837bce9e64935850dba0501846 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
-rw-r--r--src/imports/location/location.cpp2
-rw-r--r--src/imports/location/plugins.qmltypes10
2 files changed, 8 insertions, 4 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 5d1b6e23..45087751 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -196,6 +196,8 @@ public:
qmlRegisterType<QDeclarativeGeoRouteLeg, 12>(uri, major, minor, "RouteLeg");
minor = 13;
+ qmlRegisterType<QDeclarativeGeoMap, 13>(uri, major, minor, "Map");
+ qmlRegisterType<QDeclarativeGeoRoute, 13>(uri, major, minor, "Route");
qmlRegisterType<QDeclarativeGeoRouteQuery, 13>(uri, major, minor, "RouteQuery");
// Register the latest Qt version as QML type version
diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes
index 8d94169a..64f19ec1 100644
--- a/src/imports/location/plugins.qmltypes
+++ b/src/imports/location/plugins.qmltypes
@@ -152,9 +152,10 @@ Module {
exports: [
"QtLocation/Map 5.0",
"QtLocation/Map 5.11",
- "QtLocation/Map 5.12"
+ "QtLocation/Map 5.12",
+ "QtLocation/Map 5.13"
]
- exportMetaObjectRevisions: [0, 11, 12]
+ exportMetaObjectRevisions: [0, 11, 12, 13]
Property { name: "gesture"; type: "QQuickGeoMapGestureArea"; isReadonly: true; isPointer: true }
Property { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true }
Property { name: "minimumZoomLevel"; type: "double" }
@@ -470,9 +471,10 @@ Module {
exports: [
"QtLocation/Route 5.0",
"QtLocation/Route 5.11",
- "QtLocation/Route 5.12"
+ "QtLocation/Route 5.12",
+ "QtLocation/Route 5.13"
]
- exportMetaObjectRevisions: [0, 11, 12]
+ exportMetaObjectRevisions: [0, 11, 12, 13]
Property { name: "bounds"; type: "QGeoRectangle"; isReadonly: true }
Property { name: "travelTime"; type: "int"; isReadonly: true }
Property { name: "distance"; type: "double"; isReadonly: true }