From fa9c0d906d31dd1f85e235182acfea797eafbf7b Mon Sep 17 00:00:00 2001 From: abcd Date: Wed, 18 Jul 2012 19:13:18 +1000 Subject: 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 --- src/location/maps/qgeoserviceprovider.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/location') 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 -- cgit v1.2.1