Merge 5.12 into 5.12.1

Change-Id: Ib65445a9e316252e7483d2878b8cdad252242177

1 files changed, 15 insertions, 1 deletions

diff --git a/src/location/maps/qgeorouteparser.cpp b/src/location/maps/qgeorouteparser.cpp
index 646902e0..51b839dd 100644
--- a/src/location/maps/qgeorouteparser.cpp
+++ b/src/location/maps/qgeorouteparser.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
     Private class implementations
 */
 
-QGeoRouteParserPrivate::QGeoRouteParserPrivate() : QObjectPrivate()
+QGeoRouteParserPrivate::QGeoRouteParserPrivate() : QObjectPrivate(), trafficSide(QGeoRouteParser::RightHandTraffic)
 {
 }
 
@@ -85,6 +85,20 @@ QUrl QGeoRouteParser::requestUrl(const QGeoRouteRequest &request, const QString
     return d->requestUrl(request, prefix);
 }
 
+QGeoRouteParser::TrafficSide QGeoRouteParser::trafficSide() const
+{
+    Q_D(const QGeoRouteParser);
+    return d->trafficSide;
+}
+
+void QGeoRouteParser::setTrafficSide(QGeoRouteParser::TrafficSide trafficSide)
+{
+    Q_D(QGeoRouteParser);
+    if (d->trafficSide == trafficSide) return;
+    d->trafficSide = trafficSide;
+    Q_EMIT trafficSideChanged(trafficSide);
+}
+
 QT_END_NAMESPACE