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

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-10-03 09:11:28 +0000 (Sun, 03 Oct 2010)
New Revision: 14323

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

Modified: trunk/qgis/python/CMakeLists.txt
===================================================================
--- trunk/qgis/python/CMakeLists.txt	2010-10-02 12:27:25 UTC (rev 14322)
+++ trunk/qgis/python/CMakeLists.txt	2010-10-03 09:11:28 UTC (rev 14323)
@@ -39,6 +39,10 @@
   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
 ENDIF(PYQT4_VERSION_NUM LESS 263680)
 
+IF(NOT PYQT4_VERSION_NUM LESS 266496)	# 0x041100
+  SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
+ENDIF(NOT PYQT4_VERSION_NUM LESS 266496)
+
 # 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-10-02 12:27:25 UTC (rev 14322)
+++ trunk/qgis/python/core/conversions.sip	2010-10-03 09:11:28 UTC (rev 14323)
@@ -14,6 +14,8 @@
 - QMap<int, QgsOverlayObject*>*
 */
 
+%Feature QSETINT_CONVERSION
+
 %ModuleHeaderCode
 // From Python 2.5, some functions use Py_ssize_t instead of int
 // thus this typedef is for maintaining backward compatibility
@@ -264,7 +266,7 @@
 
 
 
-
+%If (QSETINT_CONVERSION)
 %MappedType QSet<int>
 {
 %TypeHeaderCode
@@ -316,6 +318,7 @@
 %End
 
 };
+%End
 
 
 template <TYPE>