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, 5 insertions, 0 deletions

diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h
index 1e4bff24..76c5421e 100644
--- a/src/location/maps/qgeomaneuver.h
+++ b/src/location/maps/qgeomaneuver.h
@@ -39,6 +39,7 @@
 
 #include <QtCore/qshareddata.h>
 #include <QtLocation/qlocationglobal.h>
+#include <QVariantMap>
 
 QT_BEGIN_NAMESPACE
 
@@ -95,9 +96,13 @@ public:
     void setWaypoint(const QGeoCoordinate &coordinate);
     QGeoCoordinate waypoint() const;
 
+    void setExtendedAttributes(const QVariantMap &extendedAttributes);
+    QVariantMap extendedAttributes() const;
+
 protected:
     QGeoManeuver(const QSharedDataPointer<QGeoManeuverPrivate> &dd);
 
+private:
     QSharedDataPointer<QGeoManeuverPrivate> d_ptr;
 };