diff options
author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-01-11 14:49:00 +0100 |
---|---|---|
committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-01-11 14:49:00 +0100 |
commit | 17b4d7ed60e4a9e521ae74a74ea084a21633955e (patch) | |
tree | 05dc1dda6ef318e35e4a7ffefdf541608e7bd33a /src/location/maps/qgeomaneuver.h | |
parent | 5edef5e181e0f3cf2e04182d06b3c781717e6f87 (diff) | |
parent | 8014727e52c65bf6496ad4adf6c8e7ec33250bb7 (diff) | |
download | qtlocation-17b4d7ed60e4a9e521ae74a74ea084a21633955e.tar.gz |
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
Diffstat (limited to 'src/location/maps/qgeomaneuver.h')
-rw-r--r-- | src/location/maps/qgeomaneuver.h | 5 |
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; }; |