Skip to content
Permalink
Browse files
fix for #2985
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14323 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Oct 3, 2010
1 parent f365b6e commit 69cf6c9bcdc2c782308659425b39cfbe7b8e1075
Showing with 8 additions and 1 deletion.
  1. +4 −0 python/CMakeLists.txt
  2. +4 −1 python/core/conversions.sip
@@ -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})
@@ -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>

0 comments on commit 69cf6c9

Please sign in to comment.