summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2018-11-30 18:06:25 +0100
committerPaolo Angelelli <paolo.angelelli@qt.io>2018-12-03 09:32:58 +0000
commit4e2847bc1a86634d6d583b33a7e246ff4c58e03b (patch)
treea4a9bc9a5c235b6a1333595dfb6fb4ec6d34d794
parentbe0658bfdb37de213f6b54837706aabc2d088d62 (diff)
downloadqtlocation-4e2847bc1a86634d6d583b33a7e246ff4c58e03b.tar.gz
Fix regression in error handling in QGeoServiceProvider
cb19e1f7e3cc2cfee3b8fcbdfa5cd151826dadac fixed a bogus comparison in an if statement. However, the correct condition is actually a bug, and should be removed altogether. The previously incorrect condition was always testing to false so the problem wasn't triggered. Task-number: QTBUG-72180 Change-Id: Ia00b55596173474e8c0fe3b0c374490620c6917f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/location/maps/qgeoserviceprovider.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp
index 27332e88..d25c379a 100644
--- a/src/location/maps/qgeoserviceprovider.cpp
+++ b/src/location/maps/qgeoserviceprovider.cpp
@@ -381,7 +381,7 @@ Manager *QGeoServiceProviderPrivate::manager(QGeoServiceProvider::Error *_error,
this->loadPlugin(this->parameterMap);
}
- if (!this->factory || this->error != QGeoServiceProvider::NoError) {
+ if (!this->factory) {
error = this->error;
errorString = this->errorString;
return 0;