Navigation Menu

Skip to content

Commit

Permalink
Merge pull request #4526 from m-kuhn/featureCounter
Browse files Browse the repository at this point in the history
Send feature counting to background task
  • Loading branch information
m-kuhn committed May 11, 2017
2 parents 5888d22 + eaabce2 commit 354b667
Show file tree
Hide file tree
Showing 19 changed files with 707 additions and 339 deletions.
3 changes: 2 additions & 1 deletion .ci/travis/linux/script.sh
Expand Up @@ -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 )"

Expand Down
4 changes: 2 additions & 2 deletions .ci/travis/macos/script.sh
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion python/auto_sip.blacklist
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions python/core/core.sip
Expand Up @@ -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
Expand Down

0 comments on commit 354b667

Please sign in to comment.