diff options
Diffstat (limited to 'src/location/labs')
| -rw-r--r-- | src/location/labs/qdeclarativenavigator.cpp | 9 | ||||
| -rw-r--r-- | src/location/labs/qgeojson.cpp | 14 |
2 files changed, 9 insertions, 14 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 diff --git a/src/location/labs/qgeojson.cpp b/src/location/labs/qgeojson.cpp index f7f37661..151091ca 100644 --- a/src/location/labs/qgeojson.cpp +++ b/src/location/labs/qgeojson.cpp @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE \section2 Importing GeoJSON - The method \l importGeoJson accepts a \l + The importGeoJson() method accepts a \l {http://doc.qt.io/qt-5/qjsondocument.html} {QJsonDocument} from which it extracts a single \l {https://tools.ietf.org/html/rfc7159} {JSON} object, since the GeoJSON RFC expects that a valid GeoJSON Document has in its root @@ -503,9 +503,9 @@ QT_BEGIN_NAMESPACE \section2 Exporting GeoJSON - The exporter accepts the QVariantList returned by \l {The importer}, and - returns a JSON document. The exporter is complementary to the importer - because it executes the inverse action. + The exporter accepts the QVariantList returned by the \l {Importing GeoJSON} + {importer}, and returns a JSON document. The exporter is complementary to + the importer because it executes the inverse action. \section2 The toString function @@ -1231,9 +1231,9 @@ QString printQvariant(const QVariant v, int tabs = 0) { } /*! -This method accepts the QVariantLists structured like described in section \l -{Importing GeoJSON}, and returns a string containing the same data in a -readable form. + This method accepts the QVariantList \a geoData, structured as described in + \l {Importing GeoJSON}, and returns a string containing the same data in a + readable form. */ QString QGeoJson::toString(const QVariantList &geoData) { return printQvariant(geoData.first(), 0); |