[QGIS Commit] r15211 - trunk/qgis/python/core

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-02-19 05:33:44 -0800 (Sat, 19 Feb 2011)
New Revision: 15211

Modified:
   trunk/qgis/python/core/conversions.sip
Log:
r15197 worked with SIP 4.12.1 on OSGeo4W
r15205 breaks SIP 4.12.1 again, but apparently works on SIP 4.12.0 on OSX
This hopefully works with both.


Modified: trunk/qgis/python/core/conversions.sip
===================================================================
--- trunk/qgis/python/core/conversions.sip	2011-02-19 13:27:35 UTC (rev 15210)
+++ trunk/qgis/python/core/conversions.sip	2011-02-19 13:33:44 UTC (rev 15211)
@@ -37,7 +37,7 @@
 #if (SIP_VERSION >= 0x040900)
 #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
 #endif
-#if (SIP_VERSION >= 0x040900 && SIP_VERSION <= 0x040c00)
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
 #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
 #endif
 %End
@@ -119,7 +119,7 @@
 #if (SIP_VERSION >= 0x040900)
 #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
 #endif
-#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c00)
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
 #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
 #endif
 %End
@@ -279,7 +279,7 @@
 #if (SIP_VERSION >= 0x040900)
 #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
 #endif
-#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c00)
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
 #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
 #endif
 %End
@@ -336,7 +336,7 @@
 #if (SIP_VERSION >= 0x040900)
 #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
 #endif
-#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c00)
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
 #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
 #endif
 %End
@@ -413,7 +413,7 @@
 #if (SIP_VERSION >= 0x040900)
 #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
 #endif
-#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c00)
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
 #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
 #endif
 %End
@@ -536,7 +536,7 @@
 #if (SIP_VERSION >= 0x040900)
 #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
 #endif
-#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c00)
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
 #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
 #endif
 %End
@@ -643,7 +643,7 @@
 #if (SIP_VERSION >= 0x040900)
 #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
 #endif
-#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c00)
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
 #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
 #endif
 %End
@@ -857,7 +857,7 @@
 #if (SIP_VERSION >= 0x040900)
 #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
 #endif
-#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c00)
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
 #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
 #endif
 %End
@@ -981,7 +981,7 @@
 #if (SIP_VERSION >= 0x040900)
 #define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
 #endif
-#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c00)
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
 #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
 #endif
 %End