summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2019-02-24 10:59:20 +0100
committerKai Koehne <kai.koehne@qt.io>2019-03-22 07:38:50 +0000
commit6365030928d3562258932647d3ade81d0a890137 (patch)
tree31152889dc1440245aabfcadc951f0d8ecf2b743
parentb5e8d016ec819183d11307698e9e48b894321b9e (diff)
downloadqtlocation-6365030928d3562258932647d3ade81d0a890137.tar.gz
Update plugins.qmltypes for Qt 5.13
Task-number: QTBUG-73484 Change-Id: Ic6025449c74fcfa242545ffc82c9a74ceb2b5f6e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/imports/location/plugins.qmltypes56
-rw-r--r--src/imports/locationlabs/plugins.qmltypes86
-rw-r--r--src/imports/positioning/plugins.qmltypes9
3 files changed, 134 insertions, 17 deletions
diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes
index c7ab0e69..8d94169a 100644
--- a/src/imports/location/plugins.qmltypes
+++ b/src/imports/location/plugins.qmltypes
@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtLocation 5.12'
+// 'qmlplugindump -nonrelocatable QtLocation 5.13'
Module {
- dependencies: ["QtQuick 2.12"]
+ dependencies: ["QtQuick 2.0"]
Component {
name: "QDeclarativeCategory"
prototype: "QObject"
@@ -324,6 +324,12 @@ Module {
}
Method { name: "prefetchData" }
Method { name: "clearData" }
+ Method {
+ name: "fitViewportToGeoShape"
+ revision: 13
+ Parameter { name: "shape"; type: "QGeoShape" }
+ Parameter { name: "margins"; type: "QVariant" }
+ }
}
Component {
name: "QDeclarativeGeoMapCopyrightNotice"
@@ -480,6 +486,13 @@ Module {
isPointer: true
}
Property { name: "legs"; revision: 12; type: "QList<QObject*>"; isReadonly: true }
+ Property {
+ name: "extendedAttributes"
+ revision: 13
+ type: "QObject"
+ isReadonly: true
+ isPointer: true
+ }
Method {
name: "equals"
type: "bool"
@@ -544,8 +557,12 @@ Module {
name: "QDeclarativeGeoRouteQuery"
defaultProperty: "quickChildren"
prototype: "QObject"
- exports: ["QtLocation/RouteQuery 5.0", "QtLocation/RouteQuery 5.11"]
- exportMetaObjectRevisions: [0, 11]
+ exports: [
+ "QtLocation/RouteQuery 5.0",
+ "QtLocation/RouteQuery 5.11",
+ "QtLocation/RouteQuery 5.13"
+ ]
+ exportMetaObjectRevisions: [0, 11, 13]
Enum {
name: "TravelMode"
values: {
@@ -646,6 +663,7 @@ Module {
Property { name: "excludedAreas"; type: "QJSValue" }
Property { name: "featureTypes"; type: "QList<int>"; isReadonly: true }
Property { name: "extraParameters"; revision: 11; type: "QVariantMap"; isReadonly: true }
+ Property { name: "departureTime"; revision: 13; type: "QDateTime" }
Property { name: "quickChildren"; type: "QObject"; isList: true; isReadonly: true }
Signal { name: "queryDetailsChanged" }
Signal { name: "extraParametersChanged"; revision: 11 }
@@ -1391,6 +1409,30 @@ Module {
Property { name: "coordinate"; type: "QGeoCoordinate" }
}
Component {
+ name: "QGeoMapObject"
+ defaultProperty: "quickChildren"
+ prototype: "QParameterizableObject"
+ Enum {
+ name: "Type"
+ values: {
+ "InvalidType": 0,
+ "ViewType": 1,
+ "RouteType": 2,
+ "RectangleType": 3,
+ "CircleType": 4,
+ "PolylineType": 5,
+ "PolygonType": 6,
+ "IconType": 7,
+ "UserType": 256
+ }
+ }
+ Property { name: "visible"; type: "bool" }
+ Property { name: "type"; type: "Type"; isReadonly: true }
+ Property { name: "geoShape"; type: "QGeoShape" }
+ Signal { name: "selected" }
+ Signal { name: "completed" }
+ }
+ Component {
name: "QGeoMapParameter"
prototype: "QObject"
Property { name: "type"; type: "string" }
@@ -1414,6 +1456,12 @@ Module {
Property { name: "accepted"; type: "bool" }
}
Component {
+ name: "QParameterizableObject"
+ defaultProperty: "quickChildren"
+ prototype: "QObject"
+ Property { name: "quickChildren"; type: "QObject"; isList: true; isReadonly: true }
+ }
+ Component {
name: "QQmlPropertyMap"
prototype: "QObject"
exports: ["QtLocation/ExtendedAttributes 5.0"]
diff --git a/src/imports/locationlabs/plugins.qmltypes b/src/imports/locationlabs/plugins.qmltypes
index e985e844..24abe0a2 100644
--- a/src/imports/locationlabs/plugins.qmltypes
+++ b/src/imports/locationlabs/plugins.qmltypes
@@ -7,7 +7,72 @@ import QtQuick.tooling 1.2
// 'qmlplugindump -nonrelocatable Qt.labs.location 1.0'
Module {
- dependencies: ["QtQuick 2.11"]
+ dependencies: ["QtQuick 2.0"]
+ Component {
+ name: "LocationLabsSingleton"
+ prototype: "QObject"
+ exports: ["Qt.labs.location/QtLocationLabs 1.0"]
+ isCreatable: false
+ isSingleton: true
+ exportMetaObjectRevisions: [0]
+ Method {
+ name: "mapObjectsAt"
+ type: "QList<QObject*>"
+ Parameter { name: "coordinate"; type: "QGeoCoordinate" }
+ Parameter { name: "map"; type: "QDeclarativeGeoMap"; isPointer: true }
+ }
+ }
+ Component {
+ name: "QAbstractNavigator"
+ prototype: "QObject"
+ Signal {
+ name: "activeChanged"
+ Parameter { name: "active"; type: "bool" }
+ }
+ Signal {
+ name: "waypointReached"
+ Parameter { name: "pos"; type: "const QDeclarativeGeoWaypoint"; isPointer: true }
+ }
+ Signal { name: "destinationReached" }
+ Signal { name: "currentRouteChanged" }
+ Signal { name: "currentRouteLegChanged" }
+ Signal { name: "currentSegmentChanged" }
+ Signal { name: "nextManeuverIconChanged" }
+ Signal { name: "progressInformationChanged" }
+ Method { name: "start"; type: "bool" }
+ Method { name: "stop"; type: "bool" }
+ Method {
+ name: "setTrackPosition"
+ Parameter { name: "trackPosition"; type: "bool" }
+ }
+ }
+ Component {
+ name: "QDeclarativeNavigationBasicDirections"
+ prototype: "QObject"
+ Property { name: "nextManeuverIcon"; type: "QVariant"; isReadonly: true }
+ Property { name: "distanceToNextManeuver"; type: "double"; isReadonly: true }
+ Property { name: "remainingTravelDistance"; type: "double"; isReadonly: true }
+ Property { name: "remainingTravelDistanceToNextWaypoint"; type: "double"; isReadonly: true }
+ Property { name: "traveledDistance"; type: "double"; isReadonly: true }
+ Property { name: "timeToNextManeuver"; type: "int"; isReadonly: true }
+ Property { name: "remainingTravelTime"; type: "int"; isReadonly: true }
+ Property { name: "remainingTravelTimeToNextWaypoint"; type: "int"; isReadonly: true }
+ Property { name: "traveledTime"; type: "int"; isReadonly: true }
+ Property { name: "currentRoute"; type: "QDeclarativeGeoRoute"; isReadonly: true; isPointer: true }
+ Property {
+ name: "currentRouteLeg"
+ type: "QDeclarativeGeoRouteLeg"
+ isReadonly: true
+ isPointer: true
+ }
+ Property { name: "currentSegment"; type: "int"; isReadonly: true }
+ Signal { name: "progressInformationChanged" }
+ Signal {
+ name: "waypointReached"
+ Parameter { name: "pos"; type: "const QDeclarativeGeoWaypoint"; isPointer: true }
+ }
+ Signal { name: "destinationReached" }
+ }
Component {
name: "QDeclarativeNavigator"
defaultProperty: "quickChildren"
@@ -21,8 +86,15 @@ Module {
Property { name: "active"; type: "bool" }
Property { name: "navigatorReady"; type: "bool"; isReadonly: true }
Property { name: "trackPositionSource"; type: "bool" }
- Property { name: "currentRoute"; type: "QDeclarativeGeoRoute"; isReadonly: true; isPointer: true }
- Property { name: "currentSegment"; type: "int"; isReadonly: true }
+ Property {
+ name: "directions"
+ type: "QDeclarativeNavigationBasicDirections"
+ isReadonly: true
+ isPointer: true
+ }
+ Property { name: "error"; type: "NavigationError"; isReadonly: true }
+ Property { name: "errorString"; type: "string"; isReadonly: true }
+ Property { name: "engineHandle"; type: "QAbstractNavigator"; isReadonly: true; isPointer: true }
Signal {
name: "navigatorReadyChanged"
Parameter { name: "ready"; type: "bool" }
@@ -35,11 +107,6 @@ Module {
name: "activeChanged"
Parameter { name: "active"; type: "bool" }
}
- Signal {
- name: "waypointReached"
- Parameter { name: "pos"; type: "const QDeclarativeGeoWaypoint"; isPointer: true }
- }
- Signal { name: "destinationReached" }
}
Component {
name: "QGeoMapObject"
@@ -61,6 +128,7 @@ Module {
}
Property { name: "visible"; type: "bool" }
Property { name: "type"; type: "Type"; isReadonly: true }
+ Property { name: "geoShape"; type: "QGeoShape" }
Signal { name: "selected" }
Signal { name: "completed" }
}
@@ -88,7 +156,7 @@ Module {
exportMetaObjectRevisions: [0]
Property { name: "coordinate"; type: "QGeoCoordinate" }
Property { name: "content"; type: "QVariant" }
- Property { name: "size"; type: "QSizeF" }
+ Property { name: "iconSize"; type: "QSizeF" }
Signal {
name: "contentChanged"
Parameter { name: "content"; type: "QVariant" }
diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes
index c599d841..c5c37db5 100644
--- a/src/imports/positioning/plugins.qmltypes
+++ b/src/imports/positioning/plugins.qmltypes
@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtPositioning 5.12'
+// 'qmlplugindump -nonrelocatable QtPositioning 5.13'
Module {
- dependencies: ["QtQuick 2.12"]
+ dependencies: ["QtQuick 2.0"]
Component {
name: "LocationSingleton"
prototype: "QObject"
@@ -138,12 +138,13 @@ Module {
Component {
name: "QDeclarativeGeoLocation"
prototype: "QObject"
- exports: ["QtPositioning/Location 5.0"]
- exportMetaObjectRevisions: [0]
+ exports: ["QtPositioning/Location 5.0", "QtPositioning/Location 5.13"]
+ exportMetaObjectRevisions: [0, 13]
Property { name: "location"; type: "QGeoLocation" }
Property { name: "address"; type: "QDeclarativeGeoAddress"; isPointer: true }
Property { name: "coordinate"; type: "QGeoCoordinate" }
Property { name: "boundingBox"; type: "QGeoRectangle" }
+ Property { name: "extendedAttributes"; revision: 13; type: "QVariantMap" }
}
Component {
name: "QDeclarativePosition"