From b2c6d045cee659f6ef6bcd2a84fa92e112468860 Mon Sep 17 00:00:00 2001 From: jef Date: Sat, 19 Feb 2011 13:33:44 +0000 Subject: [PATCH] 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. git-svn-id: http://svn.osgeo.org/qgis/trunk@15211 c8812cc2-4d05-0410-92ff-de0c093fc19c --- python/core/conversions.sip | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/python/core/conversions.sip b/python/core/conversions.sip index f229f8d3f9f..3a8cd9e32ce 100644 --- a/python/core/conversions.sip +++ b/python/core/conversions.sip @@ -37,7 +37,7 @@ template #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 @@ template #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 @@ template #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 @@ template #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 @@ template #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 @@ template #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 @@ template #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 @@ template #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 @@ template #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