43 lines
1.1 KiB
Diff
43 lines
1.1 KiB
Diff
|
--- qgis-1.6.0/python/core/conversions.sip 2010-10-03 11:11:28.000000000 +0200
|
||
|
|
+++ qgis-1.6.0_sip/python/core/conversions.sip 2011-02-02 15:15:46.725572147 +0100
|
||
|
|
@@ -15,6 +15,7 @@
|
||
|
|
*/
|
||
|
|
|
||
|
|
%Feature QSETINT_CONVERSION
|
||
|
|
+%Feature QSETTYPE_CONVERSION
|
||
|
|
|
||
|
|
%ModuleHeaderCode
|
||
|
|
// From Python 2.5, some functions use Py_ssize_t instead of int
|
||
|
|
@@ -320,7 +321,7 @@
|
||
|
|
};
|
||
|
|
%End
|
||
|
|
|
||
|
|
-
|
||
|
|
+%If (QSETTYPE_CONVERSION)
|
||
|
|
template <TYPE>
|
||
|
|
%MappedType QSet<TYPE>
|
||
|
|
{
|
||
|
|
@@ -394,8 +395,7 @@
|
||
|
|
%End
|
||
|
|
|
||
|
|
};
|
||
|
|
-
|
||
|
|
-
|
||
|
|
+%End
|
||
|
|
|
||
|
|
template<TYPE>
|
||
|
|
%MappedType QMap<int, QMap<int, TYPE> >
|
||
|
|
--- qgis-1.6.0/python/CMakeLists.txt 2010-10-04 22:05:12.000000000 +0200
|
||
|
|
+++ qgis-1.6.0_sip/python/CMakeLists.txt 2011-02-02 15:15:46.725572147 +0100
|
||
|
|
@@ -43,6 +43,10 @@
|
||
|
|
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})
|