Merge remote-tracking branch 'origin/dev' into wip/navigation

Conflicts:
	src/location/maps/qgeomaneuver.cpp
	src/location/maps/qgeomaneuver.h
	src/location/maps/qgeomaneuver_p.h
	tests/auto/declarative_core/tst_routing.qml

Change-Id: Iedf10d678a9129797f9aae872e09f78ef0a32de1

1 files changed, 40 insertions, 0 deletions

diff --git a/src/location/maps/qgeomaneuver.cpp b/src/location/maps/qgeomaneuver.cpp
index 9d6a4bf0..fb019130 100644
--- a/src/location/maps/qgeomaneuver.cpp
+++ b/src/location/maps/qgeomaneuver.cpp
@@ -293,6 +293,26 @@ QGeoCoordinate QGeoManeuver::waypoint() const
 QGeoManeuver::QGeoManeuver(const QSharedDataPointer<QGeoManeuverPrivate> &dd)
     : d_ptr(dd) {}
 
+/*!
+    Sets the extended attributes associated with this maneuver.
+
+    \since QtLocation 5.11
+*/
+void QGeoManeuver::setExtendedAttributes(const QVariantMap &extendedAttributes)
+{
+    d_ptr->setValid(true);
+    d_ptr->setExtendedAttributes(extendedAttributes);
+}
+
+/*!
+    Returns the extended attributes associated with this maneuver.
+
+    \since QtLocation 5.11
+*/
+QVariantMap QGeoManeuver::extendedAttributes() const
+{
+    return d_ptr->extendedAttributes();
+}
 
 /*******************************************************************************
 *******************************************************************************/
@@ -409,6 +429,16 @@ void QGeoManeuverPrivate::setWaypoint(const QGeoCoordinate &waypoint)
     Q_UNUSED(waypoint)
 }
 
+QVariantMap QGeoManeuverPrivate::extendedAttributes() const
+{
+    return QVariantMap();
+}
+
+void QGeoManeuverPrivate::setExtendedAttributes(const QVariantMap &extendedAttributes)
+{
+    Q_UNUSED(extendedAttributes)
+}
+
 
 
 /*******************************************************************************
@@ -517,4 +547,14 @@ void QGeoManeuverPrivateDefault::setWaypoint(const QGeoCoordinate &waypoint)
     m_waypoint = waypoint;
 }
 
+QVariantMap QGeoManeuverPrivateDefault::extendedAttributes() const
+{
+    return m_extendedAttributes;
+}
+
+void QGeoManeuverPrivateDefault::setExtendedAttributes(const QVariantMap &extendedAttributes)
+{
+    m_extendedAttributes = extendedAttributes;
+}
+
 QT_END_NAMESPACE