Skip to content
Permalink
Browse files

Fix MappedType error

  • Loading branch information
pblottiere authored and nyalldawson committed Jun 16, 2020
1 parent 29e9580 commit 718de7f69c743cf47aa8e4f24ec38b1b5e75e8af
Showing with 8 additions and 0 deletions.
  1. +5 −0 python/CMakeLists.txt
  2. +2 −0 python/core/conversions.sip
  3. +1 −0 python/core/core.sip.in
@@ -192,6 +192,11 @@ ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_
IF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18))
SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_core.pyi)
ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18))

IF((${PYQT5_VERSION_STR} VERSION_EQUAL 5.15) OR (${PYQT5_VERSION_STR} VERSION_GREATER 5.15))
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} VECTOR_MAPPED_TYPE)
ENDIF((${PYQT5_VERSION_STR} VERSION_EQUAL 5.15) OR (${PYQT5_VERSION_STR} VERSION_GREATER 5.15))

GENERATE_SIP_PYTHON_MODULE_CODE(qgis._core core/core.sip "${sip_files_core}" cpp_files)
BUILD_SIP_PYTHON_MODULE(qgis._core core/core.sip ${cpp_files} "" qgis_core)
SET(SIP_CORE_CPP_FILES ${cpp_files})
@@ -1435,6 +1435,7 @@ template <TYPE>
%End
};

%If (VECTOR_MAPPED_TYPE)
template <TYPE>
%MappedType QVector< TYPE* >
{
@@ -1507,6 +1508,7 @@ template <TYPE>
return sipGetState(sipTransferObj);
%End
};
%End

%MappedType QMap<qint64, QgsFeature*>
{
@@ -99,6 +99,7 @@ done:
%Import QtWidgets/QtWidgetsmod.sip

%Feature ANDROID
%Feature VECTOR_MAPPED_TYPE

%Include conversions.sip
%Include qgsexception.sip

0 comments on commit 718de7f

Please sign in to comment.
You can’t perform that action at this time.