124 lines
3.9 KiB
Diff
124 lines
3.9 KiB
Diff
--- qgis-1.6.0/python/CMakeLists.txt 2010-10-04 22:05:12.000000000 +0200
|
|
+++ qgis_trunk/python/CMakeLists.txt 2011-03-15 21:42:01.776231982 +0100
|
|
@@ -43,6 +45,10 @@
|
|
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
|
|
ENDIF(NOT PYQT4_VERSION_NUM LESS 263941)
|
|
|
|
+IF(NOT PYQT4_VERSION_NUM LESS 264194) # 0x040802
|
|
+ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION)
|
|
+ENDIF(NOT PYQT4_VERSION_NUM LESS 264194)
|
|
+
|
|
# core module
|
|
FILE(GLOB sip_files_core core/*.sip)
|
|
set(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
|
|
--- qgis-1.6.0/python/core/conversions.sip 2010-10-03 11:11:28.000000000 +0200
|
|
+++ qgis_trunk/python/core/conversions.sip 2011-03-15 21:42:19.106229754 +0100
|
|
@@ -15,6 +15,7 @@
|
|
*/
|
|
|
|
%Feature QSETINT_CONVERSION
|
|
+%Feature QSETTYPE_CONVERSION
|
|
|
|
%ModuleHeaderCode
|
|
// From Python 2.5, some functions use Py_ssize_t instead of int
|
|
@@ -35,6 +36,8 @@
|
|
#include <QVector>
|
|
#if (SIP_VERSION >= 0x040900)
|
|
#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
|
|
+#endif
|
|
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
|
|
#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
|
|
#endif
|
|
%End
|
|
@@ -115,6 +118,8 @@
|
|
#include <QVector>
|
|
#if (SIP_VERSION >= 0x040900)
|
|
#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
|
|
+#endif
|
|
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
|
|
#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
|
|
#endif
|
|
%End
|
|
@@ -273,6 +278,8 @@
|
|
#include <QSet>
|
|
#if (SIP_VERSION >= 0x040900)
|
|
#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
|
|
+#endif
|
|
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
|
|
#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
|
|
#endif
|
|
%End
|
|
@@ -320,7 +327,7 @@
|
|
};
|
|
%End
|
|
|
|
-
|
|
+%If (QSETTYPE_CONVERSION)
|
|
template <TYPE>
|
|
%MappedType QSet<TYPE>
|
|
{
|
|
@@ -328,6 +335,8 @@
|
|
#include <QSet>
|
|
#if (SIP_VERSION >= 0x040900)
|
|
#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
|
|
+#endif
|
|
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
|
|
#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
|
|
#endif
|
|
%End
|
|
@@ -394,8 +403,7 @@
|
|
%End
|
|
|
|
};
|
|
-
|
|
-
|
|
+%End
|
|
|
|
template<TYPE>
|
|
%MappedType QMap<int, QMap<int, TYPE> >
|
|
@@ -404,6 +412,8 @@
|
|
#include <QMap>
|
|
#if (SIP_VERSION >= 0x040900)
|
|
#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
|
|
+#endif
|
|
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
|
|
#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
|
|
#endif
|
|
%End
|
|
@@ -525,6 +535,8 @@
|
|
#include <QMap>
|
|
#if (SIP_VERSION >= 0x040900)
|
|
#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
|
|
+#endif
|
|
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
|
|
#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
|
|
#endif
|
|
%End
|
|
@@ -630,6 +642,8 @@
|
|
#include <QMap>
|
|
#if (SIP_VERSION >= 0x040900)
|
|
#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
|
|
+#endif
|
|
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
|
|
#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
|
|
#endif
|
|
%End
|
|
@@ -842,6 +856,8 @@
|
|
#include <QMultiMap>
|
|
#if (SIP_VERSION >= 0x040900)
|
|
#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
|
|
+#endif
|
|
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
|
|
#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
|
|
#endif
|
|
%End
|
|
@@ -964,6 +980,8 @@
|
|
#include <QMap>
|
|
#if (SIP_VERSION >= 0x040900)
|
|
#define sipClass_QString ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QString))
|
|
+#endif
|
|
+#if (SIP_VERSION >= 0x040900 && SIP_VERSION < 0x040c01)
|
|
#define sipClass_QVariant ((sipWrapperType *) sipTypeAsPyTypeObject (sipType_QVariant))
|
|
#endif
|
|
%End
|