sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-27 00:07:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix MappedType error

Browse Source
This commit is contained in:
Blottiere Paul 2020-06-11 00:06:25 +02:00 committed by Nyall Dawson
parent 8794483e89
commit cc19c5fb7f
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/CMakeLists.txt
View File

@ -203,6 +203,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})

2
python/core/conversions.sip
View File

@ -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*>
{

1
python/core/core.sip.in
View File

@ -99,6 +99,7 @@ done:
%Import QtWidgets/QtWidgetsmod.sip
%Feature ANDROID
%Feature VECTOR_MAPPED_TYPE
%Include conversions.sip
%Include qgsexception.sip