]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/python/python-pyqt-3.13/qt2-fix.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / python / python-pyqt-3.13 / qt2-fix.patch
1
2 #
3 # Patch managed by http://www.holgerschurig.de/patcher.html
4 #
5
6 --- PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip~qt2-fix
7 +++ PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip
8 @@ -235,7 +235,7 @@
9                 sipClass = sipClass_QCanvasLine;
10                 break;
11  
12 -#if QT_VERSION >= 300
13 +#if QT_VERSION >= 0x030000
14         case 8:
15                 sipClass = sipClass_QCanvasSpline;
16                 break;
17 --- PyQt-x11-gpl-3.13/sip/qttable/qtable.sip~qt2-fix
18 +++ PyQt-x11-gpl-3.13/sip/qttable/qtable.sip
19 @@ -114,7 +114,7 @@
20  %ConvertToSubClassCode
21         Py_BEGIN_ALLOW_THREADS
22  
23 -#if QT_VERSION >= 300
24 +#if QT_VERSION >= 0x030000
25         int rtti = sipCpp -> rtti();
26  
27         if (rtti == QCheckTableItem::RTTI)
28 --- PyQt-x11-gpl-3.13/sip/qt/qobject.sip~qt2-fix
29 +++ PyQt-x11-gpl-3.13/sip/qt/qobject.sip
30 @@ -102,7 +102,7 @@
31  #endif
32                 {sipName_QComboBox,             &sipClass_QComboBox},
33                 {sipName_QCommonStyle,          &sipClass_QCommonStyle},
34 -#if QT_VERSION >= 300
35 +#if QT_VERSION >= 0x030000
36                 {sipName_QDateEdit,             &sipClass_QDateEdit},
37                 {sipName_QDateTimeEdit,         &sipClass_QDateTimeEdit},
38                 {sipName_QDesktopWidget,        &sipClass_QDesktopWidget},
39 @@ -111,13 +111,13 @@
40                 {sipName_QDial,                 &sipClass_QDial},
41  #endif
42                 {sipName_QDialog,               &sipClass_QDialog},
43 -#if QT_VERSION >= 300
44 +#if QT_VERSION >= 0x030000
45                 {sipName_QDockArea,             &sipClass_QDockArea},
46                 {sipName_QDockWindow,           &sipClass_QDockWindow},
47  #endif
48                 {sipName_QDoubleValidator,      &sipClass_QDoubleValidator},
49                 {sipName_QDragObject,           &sipClass_QDragObject},
50 -#if QT_VERSION >= 300
51 +#if QT_VERSION >= 0x030000
52                 {sipName_QErrorMessage,         &sipClass_QErrorMessage},
53  #endif
54  #if QT_VERSION >= 0x030100
55 @@ -133,7 +133,7 @@
56                 {sipName_QFrame,                &sipClass_QFrame},
57                 {sipName_QGrid,                 &sipClass_QGrid},
58                 {sipName_QGridLayout,           &sipClass_QGridLayout},
59 -#if QT_VERSION >= 300
60 +#if QT_VERSION >= 0x030000
61                 {sipName_QGridView,             &sipClass_QGridView},
62  #endif
63                 {sipName_QGroupBox,             &sipClass_QGroupBox},
64 @@ -175,7 +175,7 @@
65                 {sipName_QNetworkOperation,     &sipClass_QNetworkOperation},
66                 {sipName_QNetworkProtocol,      &sipClass_QNetworkProtocol},
67  #endif
68 -#if QT_VERSION >= 300
69 +#if QT_VERSION >= 0x030000
70                 {sipName_QObjectCleanupHandler, &sipClass_QObjectCleanupHandler},
71  #endif
72  #if defined(SIP_FEATURE_Qt_STYLE_PLATINUM)
73 @@ -185,7 +185,7 @@
74  #if defined(WS_X11) && defined(SIP_FEATURE_Qt_PRINTDIALOG)
75                 {sipName_QPrintDialog,          &sipClass_QPrintDialog},
76  #endif
77 -#if QT_VERSION >= 300
78 +#if QT_VERSION >= 0x030000
79                 {sipName_QProcess,              &sipClass_QProcess},
80  #endif
81                 {sipName_QProgressBar,          &sipClass_QProgressBar},
82 @@ -194,7 +194,7 @@
83  #endif
84                 {sipName_QPushButton,           &sipClass_QPushButton},
85                 {sipName_QRadioButton,          &sipClass_QRadioButton},
86 -#if QT_VERSION >= 300
87 +#if QT_VERSION >= 0x030000
88                 {sipName_QRegExpValidator,      &sipClass_QRegExpValidator},
89  #endif
90  #if QT_VERSION >= 220 && defined(SIP_FEATURE_Qt_STYLE_SGI)
91 @@ -229,11 +229,11 @@
92                 {sipName_QTabWidget,            &sipClass_QTabWidget},
93                 {sipName_QTextBrowser,          &sipClass_QTextBrowser},
94                 {sipName_QTextDrag,             &sipClass_QTextDrag},
95 -#if QT_VERSION >= 300
96 +#if QT_VERSION >= 0x030000
97                 {sipName_QTextEdit,             &sipClass_QTextEdit},
98  #endif
99                 {sipName_QTextView,             &sipClass_QTextView},
100 -#if QT_VERSION >= 300
101 +#if QT_VERSION >= 0x030000
102                 {sipName_QTimeEdit,             &sipClass_QTimeEdit},
103  #endif
104                 {sipName_QTimer,                &sipClass_QTimer},
105 --- PyQt-x11-gpl-3.13/sip/qt/qevent.sip~qt2-fix
106 +++ PyQt-x11-gpl-3.13/sip/qt/qevent.sip
107 @@ -528,7 +528,7 @@
108                 sipClass = sipClass_QChildEvent;
109                 break;
110  
111 -#if QT_VERSION >= 300
112 +#if QT_VERSION >= 0x030000
113         case QEvent::ContextMenu:
114                 sipClass = sipClass_QContextMenuEvent;
115                 break;
116 @@ -539,7 +539,7 @@
117                 break;
118  #endif
119  
120 -#if QT_VERSION >= 300 && QT_VERSION < 0x030100
121 +#if QT_VERSION >= 0x030000 && QT_VERSION < 0x030100
122         case QEvent::IMCompose:
123                 sipClass = sipClass_QIMEvent;
124                 break;