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/declarativemaps | |
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/declarativemaps')
-rw-r--r-- | src/location/declarativemaps/qdeclarativegeoroutemodel.cpp | 22 | ||||
-rw-r--r-- | src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp | 4 |
2 files changed, 15 insertions, 11 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp index bbfa9b57..910e7026 100644 --- a/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp +++ b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp @@ -244,7 +244,7 @@ void QDeclarativeGeoRouteModel::cancel() /*! \qmlmethod Route QtLocation::RouteModel::get(int index) - Returns the Route at the specified index \a int. Use the \l count + Returns the Route at the specified \a index. Use the \l count property to check the amount of routes available. The routes are indexed from zero, so the accessible range is 0...(count - 1). @@ -995,7 +995,7 @@ void QDeclarativeGeoRouteQuery::setExcludedAreas(const QJSValue &value) /*! \qmlmethod void QtLocation::RouteQuery::addExcludedArea(georectangle area) - Adds the specified \a georectangle from the excluded areas + Adds the specified georectangle \a area to the excluded areas (areas that the route must not cross). The same area can only be added once. @@ -1200,25 +1200,29 @@ void QDeclarativeGeoRouteQuery::flushWaypoints(QList<QDeclarativeGeoWaypoint *> /*! \qmlmethod void QtLocation::RouteQuery::setFeatureWeight(FeatureType feature, FeatureWeight weight) - Defines the weight (\a FeatureWeight) to associate with a feature - (\a FeatureType) during the planning of a route. + Defines the \a weight to associate with a \a feature during the planning + of a route. Following lists the possible feature weights: \value RouteQuery.NeutralFeatureWeight - The presence or absence of the feature will not affect the planning of the route + The presence or absence of the feature does not affect the planning of the + route \value RouteQuery.PreferFeatureWeight - Routes which contain the feature will be preferred over those that do not + Routes which contain the feature are preferred over those that do not \value RouteQuery.RequireFeatureWeight - Only routes which contain the feature will be considered, otherwise no route will be returned + Only routes which contain the feature are considered, otherwise no + route will be returned \value RouteQuery.AvoidFeatureWeight - Routes which do not contain the feature will be preferred over those that do + Routes which do not contain the feature are preferred over those that + do \value RouteQuery.DisallowFeatureWeight - Only routes which do not contain the feature will be considered, otherwise no route will be returned + Only routes which do not contain the feature are considered, otherwise + no route will be returned \sa featureTypes, resetFeatureWeights, featureWeight diff --git a/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp b/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp index 7810dc74..483a5992 100644 --- a/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp +++ b/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype Plugin - \instantiates QDeclarativeGeoServiceProvider + //! \instantiates QDeclarativeGeoServiceProvider \inqmlmodule QtLocation \ingroup qml-QtLocation5-common \since QtLocation 5.5 @@ -866,7 +866,7 @@ bool QDeclarativeGeoServiceProviderRequirements::operator == (const QDeclarative /*! \qmltype PluginParameter - \instantiates QDeclarativePluginParameter + //! \instantiates QDeclarativePluginParameter \inqmlmodule QtLocation \ingroup qml-QtLocation5-common \since QtLocation 5.5 |