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

svn_qgis at osgeo.org svn_qgis at osgeo.org
Fri Feb 18 21:34:01 EST 2011


Author: gsherman
Date: 2011-02-18 18:34:01 -0800 (Fri, 18 Feb 2011)
New Revision: 15205

Modified:
   trunk/qgis/python/core/conversions.sip
Log:
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.

Modified: trunk/qgis/python/core/conversions.sip
===================================================================
--- trunk/qgis/python/core/conversions.sip	2011-02-19 02:33:57 UTC (rev 15204)
+++ trunk/qgis/python/core/conversions.sip	2011-02-19 02:34:01 UTC (rev 15205)
@@ -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 <= 0x040c00)
 #define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
 #endif
 %End



More information about the QGIS-commit mailing list