Let python utils manage all python cleanup

qgis · Jul 3, 2013 · 2e08ca1 · 2e08ca1
1 parent 74651b0
commit 2e08ca1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -407,7 +407,6 @@ INCLUDE_DIRECTORIES(
   ${QWT_INCLUDE_DIR}
   ${QT_QTUITOOLS_INCLUDE_DIR}
   ${QEXTSERIALPORT_INCLUDE_DIR}
-  ${PYTHON_INCLUDE_PATH}
   ../analysis/raster ../analysis/openstreetmap
   ../core
   ../core/gps
@@ -459,7 +458,6 @@ TARGET_LINK_LIBRARIES(${QGIS_APP_NAME}
   ${QT_QTMAIN_LIBRARY}
   ${QWTPOLAR_LIBRARY}
   ${GDAL_LIBRARY}
-  ${PYTHON_LIBRARY}
   qgis_core
   qgis_gui
   qgis_analysis

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -17,11 +17,6 @@
  *                                                                         *
  ***************************************************************************/
 
-//
-// Include, so we can check for the sip version
-//
-#include <sip.h>
-
 //
 // QT4 includes make sure to use the new <CamelCase> style!
 //
@@ -805,11 +800,7 @@ QgisApp::~QgisApp()
 
   delete QgsProject::instance();
 
-#if SIP_VERSION >= 0x40e06
-  if ( mPythonUtils )
-    mPythonUtils->exitPython();
   delete mPythonUtils;
-#endif
 }
 
 void QgisApp::dragEnterEvent( QDragEnterEvent *event )

diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
@@ -43,6 +43,9 @@ QgsPythonUtilsImpl::QgsPythonUtilsImpl()
 
 QgsPythonUtilsImpl::~QgsPythonUtilsImpl()
 {
+#if SIP_VERSION >= 0x40e06
+  exitPython();
+#endif
 }
 
 void QgsPythonUtilsImpl::initPython( QgisInterface* interface )