Merge branch 'GeoCat-sip-annotated'

qgis · May 1, 2017 · 699580d · 699580d
2 parents 93971d5 + 0070029
commit 699580d
Show file tree

Hide file tree

Showing 5 changed files with 577 additions and 245 deletions.
diff --git a/python/auto_sip.blacklist b/python/auto_sip.blacklist
@@ -1,7 +1,6 @@
 core/conversions.sip
 core/qgsexception.sip
 core/qgis.sip
-core/qgsdataitem.sip
 core/qgsdataitemprovider.sip
 core/qgsdataitemproviderregistry.sip
 core/qgsdbfilterproxymodel.sip
@@ -88,7 +87,6 @@ core/qgstolerance.sip
 core/qgstracer.sip
 core/qgstrackedvectorlayertools.sip
 core/qgsunittypes.sip
-core/qgsvector.sip
 core/qgsvectordataprovider.sip
 core/qgsvectorfilewriter.sip
 core/qgsvectorfilewritertask.sip