summaryrefslogtreecommitdiff
path: root/community/qgis/ticket_3378.diff
diff options
context:
space:
mode:
Diffstat (limited to 'community/qgis/ticket_3378.diff')
-rw-r--r--community/qgis/ticket_3378.diff38
1 files changed, 38 insertions, 0 deletions
diff --git a/community/qgis/ticket_3378.diff b/community/qgis/ticket_3378.diff
new file mode 100644
index 000000000..0d722e4c8
--- /dev/null
+++ b/community/qgis/ticket_3378.diff
@@ -0,0 +1,38 @@
+Index: /trunk/qgis/python/core/conversions.sip
+===================================================================
+--- /trunk/qgis/python/core/conversions.sip (revision 14323)
++++ /trunk/qgis/python/core/conversions.sip (revision 14988)
+@@ -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>
+Index: /trunk/qgis/python/CMakeLists.txt
+===================================================================
+--- /trunk/qgis/python/CMakeLists.txt (revision 14330)
++++ /trunk/qgis/python/CMakeLists.txt (revision 14988)
+@@ -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)