Skip to content

Commit

Permalink
Fix failure when compiling on OS X with Sip version 4.12.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gsherman committed Feb 19, 2011
1 parent 5466306 commit 943f6ab
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion python/core/conversions.sip
Expand Up @@ -37,7 +37,7 @@ template <TYPE>
#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
Expand Down

0 comments on commit 943f6ab

Please sign in to comment.