diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-05-04 11:13:36 +0200 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-05-04 11:13:45 +0200 |
commit | d0166d20086086fc5c4a8e437ed83fd389ee8643 (patch) | |
tree | 1928c60e483465d4ef8218c801a008afedba99b7 /src/imports/location | |
parent | d44838125389720e4352dd51ad1da02f4cb58dc8 (diff) | |
parent | 139414573ab27bd1df1b491aeb6003a6fc0d3d5d (diff) | |
download | qtlocation-d0166d20086086fc5c4a8e437ed83fd389ee8643.tar.gz |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: I0bb00d16c891856cfbe1042ce166bbd156e9f41b
Diffstat (limited to 'src/imports/location')
-rw-r--r-- | src/imports/location/location.cpp | 9 | ||||
-rw-r--r-- | src/imports/location/plugins.qmltypes | 62 |
2 files changed, 52 insertions, 19 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index 45b104b9..183d11d3 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -183,8 +183,15 @@ public: // Register the 5.11 types minor = 11; - qmlRegisterType<QDeclarativeGeoWaypoint>(uri, major, minor, "Waypoint"); + qmlRegisterType<QDeclarativeGeoManeuver, 11>(uri, major, minor, "RouteManeuver"); + qmlRegisterType<QDeclarativeGeoMap, 11>(uri, major, minor, "Map"); + qmlRegisterUncreatableType<QDeclarativeGeoMapItemBase, 11>(uri, major, minor, "GeoMapItemBase", + QStringLiteral("GeoMapItemBase is not intended instantiable by developer.")); qmlRegisterType<QDeclarativeGeoMapParameter>(uri, major, minor, "DynamicParameter"); + qmlRegisterType<QDeclarativeGeoRoute, 11>(uri, major, minor, "Route"); + qmlRegisterType<QDeclarativeGeoRouteQuery, 11>(uri, major, minor, "RouteQuery"); + qmlRegisterType<QDeclarativeGeoServiceProvider, 11>(uri, major, minor, "Plugin"); + qmlRegisterType<QDeclarativeGeoWaypoint>(uri, major, minor, "Waypoint"); // Register the latest Qt version as QML type version qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR); diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes index ed977c4a..d2d9030a 100644 --- a/src/imports/location/plugins.qmltypes +++ b/src/imports/location/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtLocation 5.10' +// 'qmlplugindump -nonrelocatable QtLocation 5.11' Module { dependencies: ["QtQuick 2.8"] @@ -108,9 +108,10 @@ Module { prototype: "QObject" exports: [ "QtLocation/RouteManeuver 5.0", + "QtLocation/RouteManeuver 5.11", "QtLocation/RouteManeuver 5.8" ] - exportMetaObjectRevisions: [0, 0] + exportMetaObjectRevisions: [0, 11, 0] Enum { name: "Direction" values: { @@ -136,14 +137,20 @@ Module { Property { name: "distanceToNextInstruction"; type: "double"; isReadonly: true } Property { name: "waypoint"; type: "QGeoCoordinate"; isReadonly: true } Property { name: "waypointValid"; type: "bool"; isReadonly: true } - Property { name: "extendedAttributes"; type: "QObject"; isReadonly: true; isPointer: true } + Property { + name: "extendedAttributes" + revision: 11 + type: "QObject" + isReadonly: true + isPointer: true + } } Component { name: "QDeclarativeGeoMap" defaultProperty: "data" prototype: "QQuickItem" - exports: ["QtLocation/Map 5.0"] - exportMetaObjectRevisions: [0] + exports: ["QtLocation/Map 5.0", "QtLocation/Map 5.11"] + exportMetaObjectRevisions: [0, 11] Property { name: "gesture"; type: "QQuickGeoMapGestureArea"; isReadonly: true; isPointer: true } Property { name: "plugin"; type: "QDeclarativeGeoServiceProvider"; isPointer: true } Property { name: "minimumZoomLevel"; type: "double" } @@ -236,7 +243,7 @@ Module { name: "mapReadyChanged" Parameter { name: "ready"; type: "bool" } } - Signal { name: "mapObjectsChanged" } + Signal { name: "mapObjectsChanged"; revision: 11 } Method { name: "setBearing" Parameter { name: "bearing"; type: "double" } @@ -333,6 +340,7 @@ Module { name: "styleSheetChanged" Parameter { name: "styleSheet"; type: "string" } } + Signal { name: "copyrightsVisibleChanged" } Method { name: "copyrightsChanged" Parameter { name: "copyrightsImage"; type: "QImage" } @@ -350,11 +358,16 @@ Module { name: "QDeclarativeGeoMapItemBase" defaultProperty: "data" prototype: "QQuickItem" - exports: ["QtLocation/GeoMapItemBase 5.0"] + exports: [ + "QtLocation/GeoMapItemBase 5.0", + "QtLocation/GeoMapItemBase 5.11" + ] isCreatable: false - exportMetaObjectRevisions: [0] + exportMetaObjectRevisions: [0, 11] Property { name: "geoShape"; type: "QGeoShape"; isReadonly: true } Signal { name: "mapItemOpacityChanged" } + Signal { name: "enterTransitionFinished"; revision: 11 } + Signal { name: "exitTransitionFinished"; revision: 11 } } Component { name: "QDeclarativeGeoMapItemGroup" @@ -375,8 +388,11 @@ Module { Component { name: "QDeclarativeGeoMapParameter" prototype: "QGeoMapParameter" - exports: ["QtLocation/MapParameter 5.9"] - exportMetaObjectRevisions: [0] + exports: [ + "QtLocation/DynamicParameter 5.11", + "QtLocation/MapParameter 5.9" + ] + exportMetaObjectRevisions: [0, 0] Signal { name: "completed" Parameter { type: "QDeclarativeGeoMapParameter"; isPointer: true } @@ -432,13 +448,20 @@ Module { Component { name: "QDeclarativeGeoRoute" prototype: "QObject" - exports: ["QtLocation/Route 5.0"] - exportMetaObjectRevisions: [0] + exports: ["QtLocation/Route 5.0", "QtLocation/Route 5.11"] + exportMetaObjectRevisions: [0, 11] Property { name: "bounds"; type: "QGeoRectangle"; isReadonly: true } Property { name: "travelTime"; type: "int"; isReadonly: true } Property { name: "distance"; type: "double"; isReadonly: true } Property { name: "path"; type: "QJSValue" } Property { name: "segments"; type: "QDeclarativeGeoRouteSegment"; isList: true; isReadonly: true } + Property { + name: "routeQuery" + revision: 11 + type: "QDeclarativeGeoRouteQuery" + isReadonly: true + isPointer: true + } } Component { name: "QDeclarativeGeoRouteModel" @@ -490,8 +513,8 @@ Module { name: "QDeclarativeGeoRouteQuery" defaultProperty: "quickChildren" prototype: "QObject" - exports: ["QtLocation/RouteQuery 5.0"] - exportMetaObjectRevisions: [0] + exports: ["QtLocation/RouteQuery 5.0", "QtLocation/RouteQuery 5.11"] + exportMetaObjectRevisions: [0, 11] Enum { name: "TravelMode" values: { @@ -591,9 +614,10 @@ Module { Property { name: "waypoints"; type: "QVariantList" } Property { name: "excludedAreas"; type: "QJSValue" } Property { name: "featureTypes"; type: "QList<int>"; isReadonly: true } + Property { name: "extraParameters"; revision: 11; type: "QVariantMap"; isReadonly: true } Property { name: "quickChildren"; type: "QObject"; isList: true; isReadonly: true } Signal { name: "queryDetailsChanged" } - Signal { name: "extraParametersChanged" } + Signal { name: "extraParametersChanged"; revision: 11 } Method { name: "waypointObjects"; type: "QVariantList" } Method { name: "addWaypoint" @@ -639,8 +663,8 @@ Module { name: "QDeclarativeGeoServiceProvider" defaultProperty: "parameters" prototype: "QObject" - exports: ["QtLocation/Plugin 5.0"] - exportMetaObjectRevisions: [0] + exports: ["QtLocation/Plugin 5.0", "QtLocation/Plugin 5.11"] + exportMetaObjectRevisions: [0, 11] Enum { name: "RoutingFeature" values: { @@ -810,10 +834,11 @@ Module { Method { name: "supportsPlaces"; type: "bool" } Method { name: "supportsNavigation" + revision: 11 type: "bool" Parameter { name: "feature"; type: "NavigationFeature" } } - Method { name: "supportsNavigation"; type: "bool" } + Method { name: "supportsNavigation"; revision: 11; type: "bool" } } Component { name: "QDeclarativeGeoServiceProviderParameter" @@ -876,6 +901,7 @@ Module { Property { name: "altitude"; type: "double" } Property { name: "isValid"; type: "bool"; isReadonly: true } Property { name: "bearing"; type: "double" } + Property { name: "metadata"; type: "QVariantMap"; isReadonly: true } Property { name: "quickChildren"; type: "QObject"; isList: true; isReadonly: true } Signal { name: "completed" } Signal { name: "waypointDetailsChanged" } |