diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-03-04 16:40:14 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-03-25 07:51:46 +0000 |
| commit | 3216d71dae42126c3d730ce56b616abebd1c5b87 (patch) | |
| tree | facd0662a0fd25f1b9586fccbc21ac7cdf9547d7 /src/location/places | |
| parent | f738357f041291eb42c8f6a6d5ca9aa1dd4ebfb1 (diff) | |
| download | qtlocation-3216d71dae42126c3d730ce56b616abebd1c5b87.tar.gz | |
Changes key of "nokia" geoservices plugin to "here"
The old name is not advertised anymore but the plugin can still be loaded
using the "nokia" key. This will be removed by later versions of Qt.
Adds a QGeoServiceProvider unit tests
Change-Id: I01f36f1bb19d31e0855e90c1605b99e61ee4450b
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Diffstat (limited to 'src/location/places')
| -rw-r--r-- | src/location/places/qplaceattribute.cpp | 2 | ||||
| -rw-r--r-- | src/location/places/qplacematchrequest.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/location/places/qplaceattribute.cpp b/src/location/places/qplaceattribute.cpp index 7369a19f..924bd89c 100644 --- a/src/location/places/qplaceattribute.cpp +++ b/src/location/places/qplaceattribute.cpp @@ -94,7 +94,7 @@ bool QPlaceAttributePrivate::isEmpty() const \li QPlaceAttribute::Provider \endlist - There is a class of attribute types of the format x_id_<provider> for example x_id_nokia. + There is a class of attribute types of the format x_id_<provider> for example x_id_here. This class of attributes is a set of alternative identifiers of the place, from the specified provider's perspective. diff --git a/src/location/places/qplacematchrequest.cpp b/src/location/places/qplacematchrequest.cpp index 2bd07e0e..40ee7ea1 100644 --- a/src/location/places/qplacematchrequest.cpp +++ b/src/location/places/qplacematchrequest.cpp @@ -110,7 +110,7 @@ void QPlaceMatchRequestPrivate::clear() A set of further parameters are specified which determines the criteria for matching. The typical key for matching is the QPlaceMatchRequest::AlternativeId, the value is an alternative identifier attribute type of the format - x_id_<provider name> for example x_id_nokia. The provider name is name supplied to the QGeoServiceProvider instance. + x_id_<provider name> for example x_id_here. The provider name is name supplied to the QGeoServiceProvider instance. See \l {Matching places between managers} for an example on how to use a match request. |