Sip update

qgis · Aug 12, 2022 · 51e3c08 · 51e3c08
1 parent a97283c
commit 51e3c08
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -156,10 +156,6 @@ if((${PYQT5_VERSION_STR} VERSION_EQUAL 5.15) OR (${PYQT5_VERSION_STR} VERSION_GR
   set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} VECTOR_MAPPED_TYPE)
 endif()
 
-if(${QT_VERSION_BASE}Core_VERSION VERSION_LESS 5.13.0)
-  set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} CONCATENATED_TABLES_MODEL)
-endif()
-
 if(NOT WITH_GUI)
   set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_GUI)
 endif()

diff --git a/python/core/core.sip.in b/python/core/core.sip.in
@@ -102,7 +102,6 @@ done:
 %Feature HAVE_GUI
 %Feature ANDROID
 %Feature VECTOR_MAPPED_TYPE
-%Feature CONCATENATED_TABLES_MODEL
 
 %Include conversions.sip
 %Include qgsexception.sip

diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -635,9 +635,7 @@
 %Include auto_generated/symbology/qgsarrowsymbollayer.sip
 %Include auto_generated/symbology/qgscategorizedsymbolrenderer.sip
 %Include auto_generated/symbology/qgscolorbrewerpalette.sip
-%If ( CONCATENATED_TABLES_MODEL )
 %Include auto_generated/symbology/qgscombinedstylemodel.sip
-%End
 %Include auto_generated/symbology/qgscptcityarchive.sip
 %Include auto_generated/symbology/qgsellipsesymbollayer.sip
 %Include auto_generated/symbology/qgsembeddedsymbolrenderer.sip