From 5389a65dc7434c4ed269a5d0c5cb93f5b12823ba Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@qt.io>
Date: Mon, 25 Mar 2019 11:09:35 +0100
Subject: [PATCH] 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>
---
src/imports/location/location.cpp | 2 ++
src/imports/location/plugins.qmltypes | 10 ++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 5d1b6e232..450877510 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 8d94169a2..64f19ec1d 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 }
--
GitLab