From 0488cffc52e142fad3606b6c2c0b6f235c1bde30 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 7 Dec 2017 16:03:54 +0100 Subject: Always step QML versions when Qt steps a version Change-Id: I2b9751dcdcee4a5d8d3353bfc2fcc43cd995b584 Reviewed-by: Paolo Angelelli --- src/imports/location/location.cpp | 3 ++ src/imports/location/plugins.qmltypes | 49 ++++++++++++++++++++++++++++++-- src/imports/positioning/plugins.qmltypes | 21 ++++++++++---- src/imports/positioning/positioning.cpp | 6 ++-- 4 files changed, 67 insertions(+), 12 deletions(-) diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index 9c89d3b8..f96b8c20 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -180,6 +180,9 @@ public: qmlRegisterUncreatableType(uri, major, minor, "CameraCapabilities" , QStringLiteral("CameraCapabilities is not intended instantiable by developer.")); + // Register the latest Qt version as QML type version + qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR); + //registrations below are version independent qRegisterMetaType(); qRegisterMetaType(); diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes index e866cac7..db6c09f3 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.9' +// 'qmlplugindump -nonrelocatable QtLocation 5.10' Module { dependencies: ["QtQuick 2.8"] @@ -90,6 +90,19 @@ Module { isCreatable: false exportMetaObjectRevisions: [0] } + Component { + name: "QDeclarativeGeoCameraCapabilities" + prototype: "QObject" + exports: ["QtLocation/CameraCapabilities 5.10"] + isCreatable: false + exportMetaObjectRevisions: [0] + Property { name: "minimumZoomLevel"; type: "double"; isReadonly: true } + Property { name: "maximumZoomLevel"; type: "double"; isReadonly: true } + Property { name: "minimumTilt"; type: "double"; isReadonly: true } + Property { name: "maximumTilt"; type: "double"; isReadonly: true } + Property { name: "minimumFieldOfView"; type: "double"; isReadonly: true } + Property { name: "maximumFieldOfView"; type: "double"; isReadonly: true } + } Component { name: "QDeclarativeGeoManeuver" prototype: "QObject" @@ -222,6 +235,16 @@ Module { name: "mapReadyChanged" Parameter { name: "ready"; type: "bool" } } + Method { + name: "setBearing" + Parameter { name: "bearing"; type: "double" } + Parameter { name: "coordinate"; type: "QGeoCoordinate" } + } + Method { + name: "alignCoordinateToPoint" + Parameter { name: "coordinate"; type: "QGeoCoordinate" } + Parameter { name: "point"; type: "QPointF" } + } Method { name: "removeMapItem" Parameter { name: "item"; type: "QDeclarativeGeoMapItemBase"; isPointer: true } @@ -238,6 +261,14 @@ Module { name: "removeMapItemGroup" Parameter { name: "itemGroup"; type: "QDeclarativeGeoMapItemGroup"; isPointer: true } } + Method { + name: "removeMapItemView" + Parameter { name: "itemView"; type: "QDeclarativeGeoMapItemView"; isPointer: true } + } + Method { + name: "addMapItemView" + Parameter { name: "itemView"; type: "QDeclarativeGeoMapItemView"; isPointer: true } + } Method { name: "clearMapItems" } Method { name: "addMapParameter" @@ -388,6 +419,13 @@ Module { Property { name: "description"; type: "string"; isReadonly: true } Property { name: "mobile"; type: "bool"; isReadonly: true } Property { name: "night"; revision: 1; type: "bool"; isReadonly: true } + Property { + name: "cameraCapabilities" + type: "QDeclarativeGeoCameraCapabilities" + isReadonly: true + isPointer: true + } + Property { name: "metadata"; type: "QVariantMap"; isReadonly: true } } Component { name: "QDeclarativeGeoRoute" @@ -482,7 +520,8 @@ Module { "TunnelFeature": 16, "DirtRoadFeature": 32, "ParksFeature": 64, - "MotorPoolLaneFeature": 128 + "MotorPoolLaneFeature": 128, + "TrafficFeature": 256 } } Enum { @@ -711,7 +750,6 @@ Module { Property { name: "required" type: "QDeclarativeGeoServiceProviderRequirements" - isReadonly: true isPointer: true } Property { name: "locales"; type: "QStringList" } @@ -771,6 +809,7 @@ Module { name: "valueChanged" Parameter { name: "value"; type: "QVariant" } } + Signal { name: "initialized" } } Component { name: "QDeclarativeGeoServiceProviderRequirements" @@ -1067,6 +1106,10 @@ Module { name: "removeCoordinate" Parameter { name: "index"; type: "int" } } + Method { + name: "setPath" + Parameter { name: "path"; type: "QGeoPath" } + } } Component { name: "QDeclarativeRatings" diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes index 859736a1..d9791c6d 100644 --- a/src/imports/positioning/plugins.qmltypes +++ b/src/imports/positioning/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 QtPositioning 5.9' +// 'qmlplugindump -nonrelocatable QtPositioning 5.10' Module { dependencies: ["QtQuick 2.8"] @@ -73,6 +73,12 @@ Module { type: "QGeoPath" Parameter { name: "value"; type: "QJSValue" } } + Method { name: "polygon"; type: "QGeoPath" } + Method { + name: "polygon" + type: "QGeoPath" + Parameter { name: "value"; type: "QVariantList" } + } Method { name: "shapeToCircle" type: "QGeoCircle" @@ -88,6 +94,11 @@ Module { type: "QGeoPath" Parameter { name: "shape"; type: "QGeoShape" } } + Method { + name: "shapeToPolygon" + type: "QGeoPolygon" + Parameter { name: "shape"; type: "QGeoShape" } + } } Component { name: "QDeclarativeGeoAddress" @@ -122,10 +133,9 @@ Module { exports: [ "QtPositioning/Position 5.0", "QtPositioning/Position 5.3", - "QtPositioning/Position 5.4", - "QtPositioning/Position 5.9" + "QtPositioning/Position 5.4" ] - exportMetaObjectRevisions: [0, 1, 2, 2] + exportMetaObjectRevisions: [0, 1, 2] Property { name: "latitudeValid"; type: "bool"; isReadonly: true } Property { name: "longitudeValid"; type: "bool"; isReadonly: true } Property { name: "altitudeValid"; type: "bool"; isReadonly: true } @@ -209,7 +219,8 @@ Module { "UnknownType": 0, "RectangleType": 1, "CircleType": 2, - "PathType": 3 + "PathType": 3, + "PolygonType": 4 } } Property { name: "type"; type: "ShapeType"; isReadonly: true } diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp index 585445b5..e25cf688 100644 --- a/src/imports/positioning/positioning.cpp +++ b/src/imports/positioning/positioning.cpp @@ -586,10 +586,8 @@ public: minor = 4; qmlRegisterType(uri, major, minor, "Position"); - // Register the 5.9 types - // Introduction of 5.9 version; existing 5.4 exports become automatically available under 5.9 - minor = 9; - qmlRegisterType(uri, major, minor, "Position"); + // Register the latest Qt version as QML type version + qmlRegisterModule(uri, QT_VERSION_MAJOR, QT_VERSION_MINOR); } else { qDebug() << "Unsupported URI given to load positioning QML plugin: " << QLatin1String(uri); } -- cgit v1.2.1