[QGIS Commit] r15170 - in branches/Release-1_6_0/python: . core

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-02-14 09:19:31 -0800 (Mon, 14 Feb 2011)
New Revision: 15170

Modified:
   branches/Release-1_6_0/python/CMakeLists.txt
   branches/Release-1_6_0/python/core/conversions.sip
Log:
backport r14988

Modified: branches/Release-1_6_0/python/CMakeLists.txt
===================================================================
--- branches/Release-1_6_0/python/CMakeLists.txt	2011-02-13 22:43:53 UTC (rev 15169)
+++ branches/Release-1_6_0/python/CMakeLists.txt	2011-02-14 17:19:31 UTC (rev 15170)
@@ -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: branches/Release-1_6_0/python/core/conversions.sip
===================================================================
--- branches/Release-1_6_0/python/core/conversions.sip	2011-02-13 22:43:53 UTC (rev 15169)
+++ branches/Release-1_6_0/python/core/conversions.sip	2011-02-14 17:19:31 UTC (rev 15170)
@@ -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> >
 {