From 943f6abfb60eb364db907e32ec7727e223b4f951 Mon Sep 17 00:00:00 2001 From: gsherman Date: Sat, 19 Feb 2011 02:34:01 +0000 Subject: [PATCH] Fix failure when compiling on OS X with Sip version 4.12. sipClass_QVariant was undefined so it appears it is still required to be defined at Sip 4.12. This has not been tested on other platforms with this Sip version so may not be a final fix. git-svn-id: http://svn.osgeo.org/qgis/trunk@15205 c8812cc2-4d05-0410-92ff-de0c093fc19c --- python/core/conversions.sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/core/conversions.sip b/python/core/conversions.sip index 09ee252ab8b..f229f8d3f9f 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 <= 0x040c00) #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) #endif %End