summaryrefslogtreecommitdiff
path: root/src/location/declarativemaps/qdeclarativegeoroute_p.h
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2022-09-23 15:19:59 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2022-09-28 17:14:34 +0200
commit104e1bb73f19eff5ca5c136bdbcb99e2e4bc196b (patch)
tree4fb6da407bad9d9e69493980c5a069ab50eb248c /src/location/declarativemaps/qdeclarativegeoroute_p.h
parent49a72acedbe4f66c94aca39f8ce9b2ea1e694366 (diff)
downloadqtlocation-104e1bb73f19eff5ca5c136bdbcb99e2e4bc196b.tar.gz
Build system: move to declarative type registration
Adjust the build system accordingly, attaching a QML module with the respective implementations to the QtLocation target. An explicit function is still needed to register converters, and will be removed once the improved support for value types has merged. This should enable the qml compiler to generate C++ code, which then requires linking against the library. The MapParameter type was renamed to DynamicMapParamter as per the 5.11 change log, so remove the MapParameter alias now and adjust tests. Task-number: QTBUG-106886 Change-Id: Id8765c1bc3b98d447d768b246b21a16f71bfdf74 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeoroute_p.h')
-rw-r--r--src/location/declarativemaps/qdeclarativegeoroute_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeoroute_p.h b/src/location/declarativemaps/qdeclarativegeoroute_p.h
index 648883f3..414d8a03 100644
--- a/src/location/declarativemaps/qdeclarativegeoroute_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoroute_p.h
@@ -67,15 +67,15 @@ class QDeclarativeGeoRouteQuery;
class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoRoute : public QObject
{
Q_OBJECT
-
+ QML_NAMED_ELEMENT(Route)
Q_PROPERTY(QGeoRectangle bounds READ bounds CONSTANT)
Q_PROPERTY(int travelTime READ travelTime CONSTANT)
Q_PROPERTY(qreal distance READ distance CONSTANT)
Q_PROPERTY(QList<QGeoCoordinate> path READ path WRITE setPath NOTIFY pathChanged)
Q_PROPERTY(QList<QGeoRouteSegment> segments READ segments CONSTANT)
- Q_PROPERTY(QDeclarativeGeoRouteQuery *routeQuery READ routeQuery REVISION 11)
- Q_PROPERTY(QList<QDeclarativeGeoRoute *> legs READ legs CONSTANT REVISION 12)
- Q_PROPERTY(QVariantMap extendedAttributes READ extendedAttributes CONSTANT REVISION 13)
+ Q_PROPERTY(QDeclarativeGeoRouteQuery *routeQuery READ routeQuery REVISION(5, 11))
+ Q_PROPERTY(QList<QDeclarativeGeoRoute *> legs READ legs CONSTANT REVISION(5, 12))
+ Q_PROPERTY(QVariantMap extendedAttributes READ extendedAttributes CONSTANT REVISION(5, 13))
Q_PROPERTY(int legIndex READ legIndex CONSTANT)
Q_PROPERTY(QDeclarativeGeoRoute *overallRoute READ overallRoute CONSTANT)