Initialize navigationManager and navigationError

delete navigationManager when is not needed anymore

Change-Id: I2bff91ef13369a32e86fba375f7f158b95cf520d
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>

2 files changed, 6 insertions, 2 deletions

diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp
index 4c4b5a02..fef4a826 100644
--- a/src/location/maps/qgeoserviceprovider.cpp
+++ b/src/location/maps/qgeoserviceprovider.cpp
@@ -636,6 +636,7 @@ QGeoServiceProviderPrivate::~QGeoServiceProviderPrivate()
     delete routingManager;
     delete mappingManager;
     delete placeManager;
+    delete navigationManager;
 }
 
 void QGeoServiceProviderPrivate::unload()
@@ -652,6 +653,9 @@ void QGeoServiceProviderPrivate::unload()
     delete placeManager;
     placeManager = 0;
 
+    delete navigationManager;
+    navigationManager = nullptr;
+
     factory = 0;
     error = QGeoServiceProvider::NoError;
     errorString = QLatin1String("");
diff --git a/src/location/maps/qgeoserviceprovider_p.h b/src/location/maps/qgeoserviceprovider_p.h
index 6703bf67..1aaa498c 100644
--- a/src/location/maps/qgeoserviceprovider_p.h
+++ b/src/location/maps/qgeoserviceprovider_p.h
@@ -93,13 +93,13 @@ public:
     QGeoRoutingManager *routingManager;
     QGeoMappingManager *mappingManager;
     QPlaceManager *placeManager;
-    QNavigationManager *navigationManager;
+    QNavigationManager *navigationManager = nullptr;
 
     QGeoServiceProvider::Error geocodeError;
     QGeoServiceProvider::Error routingError;
     QGeoServiceProvider::Error mappingError;
     QGeoServiceProvider::Error placeError;
-    QGeoServiceProvider::Error navigationError;
+    QGeoServiceProvider::Error navigationError = QGeoServiceProvider::NoError;
 
     QString geocodeErrorString;
     QString routingErrorString;