sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix #3378

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@14988 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2010-12-31 23:55:54 +00:00
parent a630e4a818
commit 741d99c9b0
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/CMakeLists.txt
View File

@ -43,6 +43,10 @@ IF(NOT PYQT4_VERSION_NUM LESS 263941) # 0x040705
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION) SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
ENDIF(NOT PYQT4_VERSION_NUM LESS 263941) ENDIF(NOT PYQT4_VERSION_NUM LESS 263941)
IF(NOT PYQT4_VERSION_NUM LESS 264194) # 0x040802
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION)
ENDIF(NOT PYQT4_VERSION_NUM LESS 264194)
# core module # core module
FILE(GLOB sip_files_core core/*.sip) FILE(GLOB sip_files_core core/*.sip)
set(SIP_EXTRA_FILES_DEPEND ${sip_files_core}) set(SIP_EXTRA_FILES_DEPEND ${sip_files_core})

6
python/core/conversions.sip
View File

@ -15,6 +15,7 @@ which are not wrapped by PyQt:
*/ */
%Feature QSETINT_CONVERSION %Feature QSETINT_CONVERSION
%Feature QSETTYPE_CONVERSION
%ModuleHeaderCode %ModuleHeaderCode
// From Python 2.5, some functions use Py_ssize_t instead of int // From Python 2.5, some functions use Py_ssize_t instead of int
@ -320,7 +321,7 @@ template <TYPE>
}; };
%End %End
%If (QSETTYPE_CONVERSION)
template <TYPE> template <TYPE>
%MappedType QSet<TYPE> %MappedType QSet<TYPE>
{ {
@ -394,8 +395,7 @@ template <TYPE>
%End %End
}; };
%End
template<TYPE> template<TYPE>
%MappedType QMap<int, QMap<int, TYPE> > %MappedType QMap<int, QMap<int, TYPE> >