diff options
| author | fanch <fanchyannmaria at orange dot fr> | 2010-06-25 23:21:12 +0200 |
|---|---|---|
| committer | fanch <fanchyannmaria at orange dot fr> | 2010-06-25 23:21:12 +0200 |
| commit | 310f8b7fafebd328cfeb3bc6ac5454786010c866 (patch) | |
| tree | 88b4c1935bb18fded6f7ea869e2028cc0c771657 /test/qgis/fix-compilation.patch | |
| parent | 7b6fa09248f85ebe415e84e54d30b8145442a3d3 (diff) | |
| parent | 2e119531564ecac7a8196d9384fc46f3e856f6ba (diff) | |
| download | nutyx-extra-310f8b7fafebd328cfeb3bc6ac5454786010c866.tar.gz nutyx-extra-310f8b7fafebd328cfeb3bc6ac5454786010c866.tar.bz2 nutyx-extra-310f8b7fafebd328cfeb3bc6ac5454786010c866.tar.xz nutyx-extra-310f8b7fafebd328cfeb3bc6ac5454786010c866.zip | |
Merge remote branch 'nutyx-attapu/master'
Diffstat (limited to 'test/qgis/fix-compilation.patch')
| -rw-r--r-- | test/qgis/fix-compilation.patch | 104 |
1 files changed, 104 insertions, 0 deletions
diff --git a/test/qgis/fix-compilation.patch b/test/qgis/fix-compilation.patch new file mode 100644 index 000000000..be295fd25 --- /dev/null +++ b/test/qgis/fix-compilation.patch @@ -0,0 +1,104 @@ +diff -Nur qgis-1.3.0.old/python/core/conversions.sip qgis-1.3.0/python/core/conversions.sip +--- qgis-1.3.0.old/python/core/conversions.sip 2009-05-14 18:58:24.000000000 +0300 ++++ qgis-1.3.0/python/core/conversions.sip 2009-10-21 14:15:48.116292334 +0300 +@@ -28,6 +28,10 @@ + { + %TypeHeaderCode + #include <QVector> ++#if (SIP_VERSION >= 0x040900) ++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) ++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) ++#endif + %End + + %ConvertFromTypeCode +@@ -104,6 +108,10 @@ + { + %TypeHeaderCode + #include <QVector> ++#if (SIP_VERSION >= 0x040900) ++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) ++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) ++#endif + %End + + %ConvertFromTypeCode +@@ -179,6 +187,10 @@ + { + %TypeHeaderCode + #include <QSet> ++#if (SIP_VERSION >= 0x040900) ++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) ++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) ++#endif + %End + + %ConvertFromTypeCode +@@ -229,6 +241,10 @@ + { + %TypeHeaderCode + #include <QSet> ++#if (SIP_VERSION >= 0x040900) ++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) ++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) ++#endif + %End + + %ConvertFromTypeCode +@@ -301,6 +317,10 @@ + { + %TypeHeaderCode + #include <QMap> ++#if (SIP_VERSION >= 0x040900) ++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) ++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) ++#endif + %End + + %ConvertFromTypeCode +@@ -418,6 +438,10 @@ + { + %TypeHeaderCode + #include <QMap> ++#if (SIP_VERSION >= 0x040900) ++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) ++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) ++#endif + %End + + %ConvertFromTypeCode +@@ -518,7 +542,11 @@ + %MappedType QMap<TYPE1, TYPE2*> + { + %TypeHeaderCode +-#include <qmap.h> ++#include <QMap> ++#if (SIP_VERSION >= 0x040900) ++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) ++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) ++#endif + %End + + %ConvertFromTypeCode +@@ -626,6 +654,10 @@ + { + %TypeHeaderCode + #include <QMultiMap> ++#if (SIP_VERSION >= 0x040900) ++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) ++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) ++#endif + %End + + %ConvertFromTypeCode +@@ -744,6 +776,10 @@ + { + %TypeHeaderCode + #include <QMap> ++#if (SIP_VERSION >= 0x040900) ++#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString)) ++#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant)) ++#endif + %End + + %ConvertFromTypeCode |