diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-11-21 11:31:00 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-11-21 11:31:00 +0100 |
| commit | b2c5fcd3a0a878a39c5e861098e94f29c1ef6b2f (patch) | |
| tree | cf23b09f65624203d809aae7e909f25cb4a061c7 /src/location/labs/qdeclarativenavigator.cpp | |
| parent | a425dd954b4319455fc29372ff2314e7dc81ee77 (diff) | |
| parent | cd7edab940934fe8b100172e3e62e7eea5c354e5 (diff) | |
| download | qtlocation-b2c5fcd3a0a878a39c5e861098e94f29c1ef6b2f.tar.gz | |
Merge 5.14 into 5.14.0
Change-Id: Id2e7b0a3d3ecefdee377094fa10a1bea4a71d06c
Diffstat (limited to 'src/location/labs/qdeclarativenavigator.cpp')
| -rw-r--r-- | src/location/labs/qdeclarativenavigator.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/location/labs/qdeclarativenavigator.cpp b/src/location/labs/qdeclarativenavigator.cpp index a4caca85..69f450f3 100644 --- a/src/location/labs/qdeclarativenavigator.cpp +++ b/src/location/labs/qdeclarativenavigator.cpp @@ -101,15 +101,10 @@ QT_BEGIN_NAMESPACE /*! \qmlproperty Route Qt.labs.location::Navigator::route - This property holds the Route that the navigator is supposed to use + This property holds the Route that the navigator is using to perform the navigation. - \note - This property is not necessarily the same as \l currentRoute. - currentRoute may differ, during routing, for various reasons. - It is reasonable to assume, however, that currentRoute's destination - will be the same as route's destination. - Setting this property while a navigation session is ongoing will + \note Setting this property while a navigation session is ongoing will stop the navigation. \sa Route |