From 9f61e0735bd4563a02511625e3b5b72d846f5ef2 Mon Sep 17 00:00:00 2001
From: sibel <lesibel at free dot fr>
Date: Thu, 24 Jun 2010 18:14:17 +0200
Subject: qgis, déplacé dans test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/qgis/fix-compilation.patch | 104 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 test/qgis/fix-compilation.patch

(limited to 'test/qgis/fix-compilation.patch')

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
-- 
cgit v1.2.3-70-g09d2