1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
|
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_qabstractfileengine.dpatch by Torsten Marek <shlomme@debian.org>
##
## DP: Make it possible to build PyQt4.0.1 with Qt 4.2
@DPATCH@
diff -urNad python-qt4-4.0.1~/sip/QtCore/qabstractfileengine.sip python-qt4-4.0.1/sip/QtCore/qabstractfileengine.sip
--- python-qt4-4.0.1~/sip/QtCore/qabstractfileengine.sip 2006-07-15 19:43:37.000000000 +0200
+++ python-qt4-4.0.1/sip/QtCore/qabstractfileengine.sip 2006-10-16 20:29:00.000000000 +0200
@@ -1,4 +1,4 @@
-// qabstractfileengine.sip generated by MetaSIP on Sat Jul 15 18:43:36 2006
+// qabstractfileengine.sip generated by MetaSIP on Mon Oct 16 03:37:42 2006
//
// This file is part of the QtCore Python extension module.
//
@@ -26,9 +26,9 @@
#include <qabstractfileengine.h>
%End
-
class QAbstractFileEngine
{
+
%TypeHeaderCode
#include <qabstractfileengine.h>
%End
@@ -246,6 +246,11 @@
protected:
void setError(QFile::FileError error, const QString &str);
QAbstractFileEngine();
+
+private:
+%If (Qt_4_2_0 -)
+ QAbstractFileEngine(const QAbstractFileEngine &);
+%End
};
QFlags<QAbstractFileEngine::FileFlag> operator|(QAbstractFileEngine::FileFlag f1, QFlags<QAbstractFileEngine::FileFlag> f2);
@@ -253,6 +258,7 @@
class QAbstractFileEngineHandler
{
+
%TypeHeaderCode
#include <qabstractfileengine.h>
%End
diff -urNad python-qt4-4.0.1~/sip/QtGui/qtextedit.sip python-qt4-4.0.1/sip/QtGui/qtextedit.sip
--- python-qt4-4.0.1~/sip/QtGui/qtextedit.sip 2006-07-15 19:43:36.000000000 +0200
+++ python-qt4-4.0.1/sip/QtGui/qtextedit.sip 2006-10-16 20:55:50.000000000 +0200
@@ -45,7 +45,7 @@
};
typedef QFlags<QTextEdit::AutoFormattingFlag> AutoFormatting;
-
+%If (- Qt_4_2_0)
enum CursorAction
{
MoveBackward,
@@ -61,6 +61,7 @@
MovePageUp,
MovePageDown,
};
+%End
explicit QTextEdit(QWidget *parent /TransferThis/ = 0);
QTextEdit(const QString &text, QWidget *parent /TransferThis/ = 0);
diff -urNad python-qt4-4.0.1~/sip/QtGui/qdirmodel.sip python-qt4-4.0.1/sip/QtGui/qdirmodel.sip
--- python-qt4-4.0.1~/sip/QtGui/qdirmodel.sip 2006-10-16 21:37:06.000000000 +0200
+++ python-qt4-4.0.1/sip/QtGui/qdirmodel.sip 2006-10-16 21:37:13.000000000 +0200
@@ -46,6 +46,12 @@
virtual QIcon icon(QFileIconProvider::IconType type) const;
virtual QIcon icon(const QFileInfo &info) const;
virtual QString type(const QFileInfo &info) const;
+
+private:
+%If (Qt_4_2_0 -)
+ QFileIconProvider(const QFileIconProvider &);
+ %End
+
};
class QDirModel : QAbstractItemModel
diff -urNad python-qt4-4.0.1~/sip/QtGui/qlayoutitem.sip python-qt4-4.0.1/sip/QtGui/qlayoutitem.sip
--- python-qt4-4.0.1~/sip/QtGui/qlayoutitem.sip 2006-10-16 21:37:06.000000000 +0200
+++ python-qt4-4.0.1/sip/QtGui/qlayoutitem.sip 2006-10-16 21:37:13.000000000 +0200
@@ -86,4 +86,9 @@
virtual QWidget *widget();
virtual bool hasHeightForWidth() const;
virtual int heightForWidth(int) const;
+private:
+%If (Qt_4_2_0 -)
+ QWidgetItem(const QWidgetItem &);
+%End
+
};
diff -urNad python-qt4-4.0.1~/sip/QtGui/qpaintengine.sip python-qt4-4.0.1/sip/QtGui/qpaintengine.sip
--- python-qt4-4.0.1~/sip/QtGui/qpaintengine.sip 2006-10-16 21:37:06.000000000 +0200
+++ python-qt4-4.0.1/sip/QtGui/qpaintengine.sip 2006-10-16 21:37:13.000000000 +0200
@@ -153,6 +153,12 @@
virtual QPaintEngine::Type type() const = 0;
bool hasFeature(QFlags<QPaintEngine::PaintEngineFeature> feature) const;
QPainter *painter() const;
+
+private:
+%If (Qt_4_2_0 -)
+ QPaintEngine(const QPaintEngine &);
+%End
+
};
QFlags<QPaintEngine::PaintEngineFeature> operator|(QPaintEngine::PaintEngineFeature f1, QFlags<QPaintEngine::PaintEngineFeature> f2);
diff -urNad python-qt4-4.0.1~/sip/QtGui/qpainter.sip python-qt4-4.0.1/sip/QtGui/qpainter.sip
--- python-qt4-4.0.1~/sip/QtGui/qpainter.sip 2006-10-16 21:37:06.000000000 +0200
+++ python-qt4-4.0.1/sip/QtGui/qpainter.sip 2006-10-16 21:37:13.000000000 +0200
@@ -431,6 +431,12 @@
void setWindow(int x, int y, int w, int h);
void drawPicture(int x, int y, const QPicture &p);
void drawPicture(const QPoint &pt, const QPicture &p);
+
+private:
+%If (Qt_4_2_0 -)
+ QPainter(const QPainter &);
+%End
+
};
QFlags<QPainter::RenderHint> operator|(QPainter::RenderHint f1, QFlags<QPainter::RenderHint> f2);
diff -urNad python-qt4-4.0.1~/sip/QtXml/qxml.sip python-qt4-4.0.1/sip/QtXml/qxml.sip
--- python-qt4-4.0.1~/sip/QtXml/qxml.sip 2006-10-16 21:37:06.000000000 +0200
+++ python-qt4-4.0.1/sip/QtXml/qxml.sip 2006-10-16 21:38:52.000000000 +0200
@@ -41,6 +41,12 @@
void pushContext();
void popContext();
void reset();
+
+private:
+%If (Qt_4_2_0 -)
+ QXmlNamespaceSupport(const QXmlNamespaceSupport &);
+%End
+
};
class QXmlAttributes
@@ -322,4 +328,9 @@
virtual bool internalEntityDecl(const QString &name, const QString &value);
virtual bool externalEntityDecl(const QString &name, const QString &publicId, const QString &systemId);
virtual QString errorString() const;
+
+private:
+%If (Qt_4_2_0 -)
+ QXmlDefaultHandler(const QXmlDefaultHandler &);
+%End
};
diff -urNad python-qt4-4.0.1~/sip/QtCore/QtCoremod.sip python-qt4-4.0.1/sip/QtCore/QtCoremod.sip
--- python-qt4-4.0.1~/sip/QtCore/QtCoremod.sip 2006-07-15 19:43:37.000000000 +0200
+++ python-qt4-4.0.1/sip/QtCore/QtCoremod.sip 2006-10-16 20:48:27.000000000 +0200
@@ -24,7 +24,7 @@
%Module PyQt4.QtCore 0
-%Timeline {Qt_4_1_1 Qt_4_1_2 Qt_4_1_3}
+%Timeline {Qt_4_1_1 Qt_4_1_2 Qt_4_1_3 Qt_4_2_0}
%Platforms {WS_X11 WS_WIN WS_MACX}
|
