Merge pull request #4526 from m-kuhn/featureCounter

Send feature counting to background task
qgis · May 11, 2017 · 354b667 · 354b667
2 parents 5888d22 + eaabce2
commit 354b667
Show file tree

Hide file tree

Showing 19 changed files with 707 additions and 339 deletions.
diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -18,7 +18,8 @@ export PATH=${HOME}/osgeo4travis/bin:${HOME}/osgeo4travis/sbin:${HOME}/OTB-5.6.0
 export LD_LIBRARY_PATH=${HOME}/osgeo4travis/lib
 export CTEST_PARALLEL_LEVEL=1
 export CCACHE_TEMPDIR=/tmp
-ccache -M 2G
+ccache -M 500M
+ccache -z
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 

diff --git a/.ci/travis/macos/script.sh b/.ci/travis/macos/script.sh
@@ -18,8 +18,8 @@ echo $PATH
 
 export PATH=/usr/bin:${PATH}
 
-ccache -s
-ccache -M 1G
+ccache -M 500M
+ccache -z
 
 # Calculate the timeout for the tests.
 # The tests should be aborted before travis times out, in order to allow uploading

diff --git a/python/auto_sip.blacklist b/python/auto_sip.blacklist
@@ -72,7 +72,6 @@ core/qgssnappingutils.sip
 core/qgsspatialindex.sip
 core/qgssqlstatement.sip
 core/qgsstringutils.sip
-core/qgstaskmanager.sip
 core/qgstolerance.sip
 core/qgstracer.sip
 core/qgstrackedvectorlayertools.sip

diff --git a/python/core/core.sip b/python/core/core.sip
@@ -165,6 +165,7 @@
 %Include qgsvectorlayercache.sip
 %Include qgsvectorlayereditbuffer.sip
 %Include qgsvectorlayereditpassthrough.sip
+%Include qgsvectorlayerfeaturecounter.sip
 %Include qgsvectorlayerimport.sip
 %Include qgsvectorlayerjoinbuffer.sip
 %Include qgsvectorlayerjoininfo.sip