summaryrefslogtreecommitdiff
path: root/src/imports/positioning
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2017-11-06 16:21:58 +0100
committerPaolo Angelelli <paolo.angelelli@qt.io>2017-11-30 16:20:12 +0000
commit74e0f7b414432688858ce9d82a05384b4f883688 (patch)
tree8829ceb8bca000db8383f991240832e5c1e72835 /src/imports/positioning
parent3e107c6d2933b4b924100d1aab18f52f7ca40edc (diff)
downloadqtlocation-74e0f7b414432688858ce9d82a05384b4f883688.tar.gz
Introduce Waypoint
This patch replaces QGeoCoordinate with Waypoint as mean to specify waypoints in a RouteQuery. This patch also adds a new invokable to RouteQuery, waypointObjects, to return QDeclarativeGeoWaypoints instead of QGeoCooordinates. NOTE: If, by 5.11, support to perform implicit conversions in method invocations based on converters registered in the metatype system will be added, this method could/should be removed, and QDeclarativeGeoWaypoint objects should be return as QVariants from the waypoints() getter, as they could be used in place of QGeoCoordinate when passing them as arguments. Task-number: QTBUG-64066 Change-Id: I77747f53cdcbabe6430580b60fa59d4afe8c650a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/imports/positioning')
-rw-r--r--src/imports/positioning/positioning.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 585445b5..a324905b 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -57,6 +57,7 @@
#include <QtPositioning/QGeoCircle>
#include <QtPositioning/QGeoPath>
#include <QtPositioning/QGeoLocation>
+#include <QtPositioning/private/qgeocoordinateobject_p.h>
#include <QtCore/QDebug>
@@ -565,6 +566,7 @@ public:
qRegisterMetaType<QGeoLocation>();
qRegisterMetaType<QGeoShape>();
QMetaType::registerEqualsComparator<QGeoShape>();
+ qRegisterMetaType<QGeoCoordinateObject *>();
qRegisterAnimationInterpolator<QGeoCoordinate>(q_coordinateInterpolator);