Merge remote-tracking branch 'gerrit/5.6' into 5.7

Conflicts:
	src/imports/location/qdeclarativegeomap.cpp
	src/location/maps/maps.pri

Change-Id: I346d7351e98f4a1aa67c9c0401d41b6da9099f48

1 files changed, 3 insertions, 0 deletions

diff --git a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h
index 0dac897a..8e2d7f50 100644
--- a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h
+++ b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h
@@ -42,6 +42,7 @@
 
 #include <QtLocation/QGeoServiceProvider>
 #include <QtLocation/QGeoRoutingManagerEngine>
+#include <QtLocation/private/qgeorouteparser_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -58,6 +59,7 @@ public:
     ~QGeoRoutingManagerEngineOsm();
 
     QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request);
+    const QGeoRouteParser *routeParser() const;
 
 private Q_SLOTS:
     void replyFinished();
@@ -65,6 +67,7 @@ private Q_SLOTS:
 
 private:
     QNetworkAccessManager *m_networkManager;
+    QGeoRouteParser *m_routeParser;
     QByteArray m_userAgent;
     QString m_urlPrefix;
 };