Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix #3378
git-svn-id: http://svn.osgeo.org/qgis/trunk@14988 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Dec 31, 2010
1 parent a630e4a commit 741d99c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions python/CMakeLists.txt
Expand Up @@ -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})
Expand Down
6 changes: 3 additions & 3 deletions python/core/conversions.sip
Expand Up @@ -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
Expand Down Expand Up @@ -320,7 +321,7 @@ template <TYPE>
};
%End


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

};


%End

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

0 comments on commit 741d99c

Please sign in to comment.