Skip to content
Permalink
Browse files

backport r14988

git-svn-id: http://svn.osgeo.org/qgis/branches/Release-1_6_0@15170 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Feb 14, 2011
1 parent e7ab007 commit ecdc73ce98254d6ceb67f3f6be9d3f2ee3647ce2
Showing with 7 additions and 3 deletions.
  1. +4 −0 python/CMakeLists.txt
  2. +3 −3 python/core/conversions.sip
@@ -43,6 +43,10 @@ IF(NOT PYQT4_VERSION_NUM LESS 263941) # 0x040705
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
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
FILE(GLOB sip_files_core core/*.sip)
set(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
@@ -15,6 +15,7 @@ which are not wrapped by PyQt:
*/

%Feature QSETINT_CONVERSION
%Feature QSETTYPE_CONVERSION

%ModuleHeaderCode
// From Python 2.5, some functions use Py_ssize_t instead of int
@@ -320,7 +321,7 @@ template <TYPE>
};
%End


%If (QSETTYPE_CONVERSION)
template <TYPE>
%MappedType QSet<TYPE>
{
@@ -394,8 +395,7 @@ template <TYPE>
%End

};


%End

template<TYPE>
%MappedType QMap<int, QMap<int, TYPE> >

0 comments on commit ecdc73c

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