[QGIS Commit] r14988 - in trunk/qgis/python: . core

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-12-31 15:55:54 -0800 (Fri, 31 Dec 2010)
New Revision: 14988

Modified:
   trunk/qgis/python/CMakeLists.txt
   trunk/qgis/python/core/conversions.sip
Log:
fix #3378

Modified: trunk/qgis/python/CMakeLists.txt
===================================================================
--- trunk/qgis/python/CMakeLists.txt	2010-12-31 14:22:47 UTC (rev 14987)
+++ trunk/qgis/python/CMakeLists.txt	2010-12-31 23:55:54 UTC (rev 14988)
@@ -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})

Modified: trunk/qgis/python/core/conversions.sip
===================================================================
--- trunk/qgis/python/core/conversions.sip	2010-12-31 14:22:47 UTC (rev 14987)
+++ trunk/qgis/python/core/conversions.sip	2010-12-31 23:55:54 UTC (rev 14988)
@@ -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,9 +395,8 @@
 %End
 
 };
+%End
 
-
-
 template<TYPE>
 %MappedType QMap<int, QMap<int, TYPE> >
 {