[SCM] qgis branch, master, updated. a2ee769957385f4e084c5e8b6ba178a8c877d1db

[Juergen E. Fischer]

The following commit has been merged in the master branch:
commit 533ac4c4ca776e18ff6d1a9154d72391b76c5f7e
Author: Juergen E. Fischer <jef at norbit.de>
Date:   Mon Mar 12 22:48:01 2012 +0100

    fix crash on quit

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index 5c28856..05e18d1 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -1679,6 +1679,7 @@ void QgisApp::createCanvasTools()
 #else
   mAdvancedDigitizeToolBar->removeAction( mActionOffsetCurve );
   mEditMenu->removeAction( mActionOffsetCurve );
+  mMapTools.mOffsetCurve = 0;
 #endif //GEOS_VERSION
   mMapTools.mReshapeFeatures = new QgsMapToolReshape( mMapCanvas );
   mMapTools.mReshapeFeatures->setAction( mActionReshapeFeatures );
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
index 28efa28..d3e23a7 100644
--- a/src/gui/qgsexpressionbuilderwidget.cpp
+++ b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -415,7 +415,7 @@ QString QgsExpressionBuilderWidget::loadFunctionHelp( QgsExpressionItem* functio
 
   QString missingError = tr( "<h3>Oops! QGIS can't find help for this function.</h3>"
                              "The help file for %1 was not found.<br>"
-														 ).arg( Qt::escape( name ) );
+                           ).arg( Qt::escape( name ) );
 
   if ( !lang.startsWith( "en_" ) )
   {

-- 
The Quantum GIS in Debian project