diff options
| author | abcd <amos.choy@nokia.com> | 2012-07-18 19:13:18 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-20 09:38:53 +0200 |
| commit | fa9c0d906d31dd1f85e235182acfea797eafbf7b (patch) | |
| tree | ef4cc830f198d331686f136b2bb25c75764a91e7 /src/location | |
| parent | 6a80e4afa9e04b64b8dbfdfa2e3d7cd3c8058bbc (diff) | |
| download | qtlocation-fa9c0d906d31dd1f85e235182acfea797eafbf7b.tar.gz | |
Fix incorrect warning messages + refactor error handling
There was an assumption in the QML models that if the
QGeoServiceProvider::placeManager() returned null, then places was
not supported. This is no longer the case as incorrect parmeters
may result in null being returned.
Previously a warning was output to console. Instead, if possible,
we set the error status of the model, and set the error string
to the one provided by the QGeoServiceProvider. If it is not
possible, such as in the case of the Icon element, a warning is
output to console but only if it is deemed necessary.
Task-number: QTBUG-26566
Change-Id: I584222af9325ddb8575fa8f77909521c49bc850a
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src/location')
| -rw-r--r-- | src/location/maps/qgeoserviceprovider.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp index d8efea3a..e80d9d58 100644 --- a/src/location/maps/qgeoserviceprovider.cpp +++ b/src/location/maps/qgeoserviceprovider.cpp @@ -463,9 +463,6 @@ QGeoRoutingManager *QGeoServiceProvider::routingManager() const /*! Returns the QPlaceManager made available by the service provider. - This function will return 0 if the service provider does not provide - any place searching services. - This function will attempt to construct a QPlaceManager instance when it is called for the first time. If the attempt is successful the QPlaceManager will be cached, otherwise each call of this function |