Merge branch 'master' into sip-annotated

Author: 3nids

.ci/travis/macos/script.sh

@@ -35,7 +35,7 @@ gtimeout ${TIMEOUT}s ctest -V -E "$(cat ${DIR}/blacklist.txt | gsed -r '/^(#.*?)
 
 rv=$?
 
-if [ $? -eq 124 ] ; then
+if [ $rv -eq 124 ] ; then
     echo '\033[0;33mBuild and test timeout. Please restart the build for useful results.\033[0m'
 fi
 

debian/python-qgis.install.in

@@ -5,5 +5,4 @@ usr/lib/python*/*-packages/qgis/gui/*
 usr/lib/python*/*-packages/qgis/analysis/*
 usr/lib/python*/*-packages/qgis/PyQt/*
 usr/lib/python*/*-packages/qgis/testing/*
-usr/lib/python*/*-packages/pyspatialite/*
 usr/lib/python*/*-packages/qgis/server/*

python/analysis/vector/qgsoverlayanalyzer.sip

@@ -1,24 +1,46 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/analysis/vector/qgsoverlayanalyzer.h                             *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
 
-/** \ingroup analysis
- * The Qgis class provides vector overlay analysis functions
- */
 
 class QgsOverlayAnalyzer
 {
-%TypeHeaderCode
-#include <qgsoverlayanalyzer.h>
+%Docstring
+ The QGis class provides vector overlay analysis functions
 %End
 
+%TypeHeaderCode
+#include "qgsoverlayanalyzer.h"
+%End
   public:
 
-    /** Perform an intersection on two input vector layers and write output to a new shape file
-      @param layerA input vector layer
-      @param layerB input vector layer
-      @param shapefileName path to the output shp
-      @param onlySelectedFeatures if true, only selected features are considered, else all the features
-      @param p progress dialog (or 0 if no progress dialog is to be shown)
-      */
-    bool intersection( QgsVectorLayer* layerA, QgsVectorLayer* layerB,
-                       const QString& shapefileName, bool onlySelectedFeatures = false,
-                       QProgressDialog* p = 0 );
+    bool intersection( QgsVectorLayer *layerA, QgsVectorLayer *layerB,
+                       const QString &shapefileName, bool onlySelectedFeatures = false,
+                       QProgressDialog *p = 0 );
+%Docstring
+ Perform an intersection on two input vector layers and write output to a new shape file
+\param layerA input vector layer
+\param layerB input vector layer
+\param shapefileName path to the output shp
+\param onlySelectedFeatures if true, only selected features are considered, else all the features
+\param p progress dialog (or 0 if no progress dialog is to be shown)
+ :rtype: bool
+%End
+
 };
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/analysis/vector/qgsoverlayanalyzer.h                             *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/

python/auto_sip.blacklist

@@ -7,17 +7,11 @@ core/qgsdbfilterproxymodel.sip
 core/qgseditformconfig.sip
 core/qgseditorwidgetsetup.sip
 core/qgserror.sip
-core/qgsexpression.sip
 core/qgsexpressioncontext.sip
 core/qgsexpressioncontextgenerator.sip
 core/qgsfeaturefilterprovider.sip
 core/qgsfeatureiterator.sip
 core/qgsfeaturerequest.sip
-core/qgsfield.sip
-core/qgsfieldconstraints.sip
-core/qgsfields.sip
-core/qgsfieldformatterregistry.sip
-core/qgsfieldformatter.sip
 core/qgsgeometrysimplifier.sip
 core/qgsgeometryvalidator.sip
 core/qgsgml.sip
@@ -64,7 +58,6 @@ core/qgspallabeling.sip
 core/qgspathresolver.sip
 core/qgspluginlayer.sip
 core/qgspluginlayerregistry.sip
-core/qgspoint.sip
 core/qgspointlocator.sip
 core/qgsproject.sip
 core/qgsprojectbadlayerhandler.sip
@@ -85,12 +78,9 @@ core/qgsruntimeprofiler.sip
 core/qgsscalecalculator.sip
 core/qgsscaleutils.sip
 core/qgssimplifymethod.sip
-core/qgssnapper.sip
 core/qgssnappingutils.sip
 core/qgsspatialindex.sip
 core/qgssqlstatement.sip
-core/qgsstatisticalsummary.sip
-core/qgsstringstatisticalsummary.sip
 core/qgsstringutils.sip
 core/qgstaskmanager.sip
 core/qgstolerance.sip
@@ -269,7 +259,6 @@ gui/qgsblendmodecombobox.sip
 gui/qgisinterface.sip
 gui/qgsactionmenu.sip
 gui/qgsadvanceddigitizingcanvasitem.sip
-gui/qgsadvanceddigitizingdockwidget.sip
 gui/qgsattributedialog.sip
 gui/qgsattributeeditorcontext.sip
 gui/qgsattributeform.sip
@@ -278,18 +267,12 @@ gui/qgsattributeforminterface.sip
 gui/qgsattributetypeloaddialog.sip
 gui/qgsbrowsertreeview.sip
 gui/qgsbusyindicatordialog.sip
-gui/qgscollapsiblegroupbox.sip
 gui/qgscodeeditor.sip
 gui/qgscodeeditorpython.sip
 gui/qgscodeeditorsql.sip
 gui/qgscodeeditorhtml.sip
 gui/qgscodeeditorcss.sip
 gui/qgscharacterselectdialog.sip
-gui/qgscolorbrewercolorrampdialog.sip
-gui/qgscolordialog.sip
-gui/qgscolorschemelist.sip
-gui/qgscolorswatchgrid.sip
-gui/qgscolorwidgets.sip
 gui/qgscomposerinterface.sip
 gui/qgscomposeritemcombobox.sip
 gui/qgscomposerruler.sip
@@ -318,7 +301,6 @@ gui/qgsformannotation.sip
 gui/qgsgeometryrubberband.sip
 gui/qgsgradientcolorrampdialog.sip
 gui/qgsgradientstopeditor.sip
-gui/qgsgroupwmsdatadialog.sip
 gui/qgshelp.sip
 gui/qgshighlight.sip
 gui/qgshistogramwidget.sip
@@ -354,7 +336,6 @@ gui/qgsmessagebar.sip
 gui/qgsmessagebaritem.sip
 gui/qgsmessageviewer.sip
 gui/qgsnewhttpconnection.sip
-gui/qgsnewmemorylayerdialog.sip
 gui/qgsnewnamedialog.sip
 gui/qgsnewvectorlayerdialog.sip
 gui/qgsnewgeopackagelayerdialog.sip
@@ -503,7 +484,6 @@ gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.sip
 gui/layertree/qgslayertreeview.sip
 analysis/vector/qgsgeometryanalyzer.sip
 analysis/vector/qgsgeometrysnapper.sip
-analysis/vector/qgsoverlayanalyzer.sip
 analysis/vector/qgspointsample.sip
 analysis/vector/qgstransectsample.sip
 analysis/vector/qgszonalstatistics.sip