sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix for #2985

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@14323 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2010-10-03 09:11:28 +00:00
parent df1a16ec02
commit 3cf96c28f4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/CMakeLists.txt
View File

@ -39,6 +39,10 @@ IF(PYQT4_VERSION_NUM LESS 263680) # 0x040600
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
ENDIF(PYQT4_VERSION_NUM LESS 263680)
IF(NOT PYQT4_VERSION_NUM LESS 266496) # 0x041100
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
ENDIF(NOT PYQT4_VERSION_NUM LESS 266496)
# core module
FILE(GLOB sip_files_core core/*.sip)
set(SIP_EXTRA_FILES_DEPEND ${sip_files_core})

5
python/core/conversions.sip
View File

@ -14,6 +14,8 @@ which are not wrapped by PyQt:
- QMap<int, QgsOverlayObject*>*
*/
%Feature QSETINT_CONVERSION
%ModuleHeaderCode
// From Python 2.5, some functions use Py_ssize_t instead of int
// thus this typedef is for maintaining backward compatibility
@ -264,7 +266,7 @@ template <TYPE>
%If (QSETINT_CONVERSION)
%MappedType QSet<int>
{
%TypeHeaderCode
@ -316,6 +318,7 @@ template <TYPE>
%End
};
%End
template <TYPE>