Index: trunk/qgis/python/CMakeLists.txt
===================================================================
--- python/CMakeLists.txt
+++ python/CMakeLists.txt
@@ -44,4 +44,8 @@
 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)
Index: trunk/qgis/python/core/conversions.sip
===================================================================
--- python/core/conversions.sip
+++ python/core/conversions.sip
@@ -16,4 +16,5 @@
 
 %Feature QSETINT_CONVERSION
+%Feature QSETTYPE_CONVERSION
 
 %ModuleHeaderCode
@@ -321,5 +322,5 @@
 %End
 
-
+%If (QSETTYPE_CONVERSION)
 template <TYPE>
 %MappedType QSet<TYPE>
@@ -395,6 +396,5 @@
 
 };
-
-
+%End
 
 template<TYPE>