summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qt-2.3.7.patch/qte237-all.patch241
1 files changed, 67 insertions, 174 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-all.patch b/qt/qt-2.3.7.patch/qte237-all.patch
index cb09109..596db2f 100644
--- a/qt/qt-2.3.7.patch/qte237-all.patch
+++ b/qt/qt-2.3.7.patch/qte237-all.patch
@@ -1,572 +1,465 @@
1diff -ru qt-2.3.5_fresh/include/qapplication.h qt-2.3.5/include/qapplication.h 1
2 --- qt-2.3.5_fresh/include/qapplication.h2003-05-13 15:56:10.000000000 +0200 2#
3 +++ qt-2.3.5/include/qapplication.h2003-05-13 15:58:18.000000000 +0200 3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4@@ -61,6 +61,10 @@ 4#
5 class QSemaphore; 5
6 #endif 6 --- qt-2.3.7/src/kernel/qapplication.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200
7 7 +++ qt-2.3.7/src/kernel/qapplication.cpp2004-04-15 21:06:51.232857014 +0200
8+#if !defined( QT_WEAK_SYMBOL )
9+#define QT_WEAK_SYMBOL
10+#endif
11+
12 // REMOVE IN 3.0 (just here for moc source compatibility)
13 #define QNonBaseApplication QApplication
14
15@@ -85,7 +89,10 @@
16
17 #ifndef QT_NO_STYLE
18 static QStyle &style();
19 - static void setStyle( QStyle* );
20 + static void setStyle( QStyle* ) QT_WEAK_SYMBOL;
21+private:
22 +static void setStyle_NonWeak( QStyle* );
23+public:
24 #endif
25 #if 1/* OBSOLETE */
26 enum ColorMode { NormalColors, CustomColors };
27@@ -106,11 +113,19 @@
28 #ifndef QT_NO_PALETTE
29 static QPalette palette( const QWidget* = 0 );
30 static void setPalette( const QPalette &, bool informWidgets=FALSE,
31 + const char* className = 0 ) QT_WEAK_SYMBOL;
32+private:
33 + static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE,
34 const char* className = 0 );
35+public:
36 #endif
37 static QFont font( const QWidget* = 0 );
38 static void setFont( const QFont &, bool informWidgets=FALSE,
39 + const char* className = 0 ) QT_WEAK_SYMBOL;
40+private:
41 + static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE,
42 const char* className = 0 );
43 +public:
44 static QFontMetrics fontMetrics();
45
46 QWidget *mainWidget() const;
47@@ -207,7 +222,10 @@
48 void qwsSetCustomColors( QRgb *colortable, int start, int numColors );
49 #ifndef QT_NO_QWS_MANAGER
50 static QWSDecoration &qwsDecoration();
51- static void qwsSetDecoration( QWSDecoration *);
52+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL;
53+private:
54+ static void qwsSetDecoration_NonWeak( QWSDecoration *);
55+public:
56 #endif
57 #endif
58
59diff -ru qt-2.3.5_fresh/include/qfontdatabase.h qt-2.3.5/include/qfontdatabase.h
60 --- qt-2.3.5_fresh/include/qfontdatabase.h2003-05-13 15:56:11.000000000 +0200
61 +++ qt-2.3.5/include/qfontdatabase.h2003-05-13 15:58:18.000000000 +0200
62@@ -59,6 +59,10 @@
63 class QDiskFont;
64 #endif
65
66+#if !defined( QT_WEAK_SYMBOL )
67+#define QT_WEAK_SYMBOL
68+#endif
69+
70 class QFontDatabasePrivate;
71
72 class Q_EXPORT QFontDatabase
73@@ -67,9 +71,16 @@
74 QFontDatabase();
75
76 QStringList families( bool onlyForLocale = TRUE ) const;
77+
78+
79 QValueList<int> pointSizes( const QString &family,
80 const QString &style = QString::null,
81 - const QString &charSet = QString::null );
82 + const QString &charSet = QString::null ) QT_WEAK_SYMBOL;
83+private:
84+ QValueList<int> pointSizes_NonWeak( const QString &family,
85 + const QString &style,
86 + const QString &charSet );
87+public:
88 QStringList styles( const QString &family,
89 const QString &charSet = QString::null ) const;
90 QStringList charSets( const QString &familyName,
91diff -ru qt-2.3.5_fresh/src/kernel/qapplication.cpp qt-2.3.5/src/kernel/qapplication.cpp
92 --- qt-2.3.5_fresh/src/kernel/qapplication.cpp2003-05-13 15:56:10.000000000 +0200
93 +++ qt-2.3.5/src/kernel/qapplication.cpp2003-05-13 15:58:19.000000000 +0200
94@@ -35,6 +35,8 @@ 8@@ -35,6 +35,8 @@
95 ** 9 **
96 **********************************************************************/ 10 **********************************************************************/
97 11
98 +#define QT_WEAK_SYMBOL__attribute__(( weak )) 12 +#define QT_WEAK_SYMBOL__attribute__(( weak ))
99+ 13+
100 #include "qobjectlist.h" 14 #include "qobjectlist.h"
101 #include "qobjectdict.h" 15 #include "qobjectdict.h"
102 #include "qapplication.h" 16 #include "qapplication.h"
103@@ -933,11 +935,16 @@ 17@@ -933,11 +935,16 @@
104 #ifndef QT_NO_STYLE 18 #ifndef QT_NO_STYLE
105 void QApplication::setStyle( QStyle *style ) 19 void QApplication::setStyle( QStyle *style )
106 { 20 {
107 +setStyle_NonWeak ( style ); 21 +setStyle_NonWeak ( style );
108+} 22+}
109+ 23+
110+void QApplication::setStyle_NonWeak( QStyle *style ) 24+void QApplication::setStyle_NonWeak( QStyle *style )
111+{ 25+{
112 QStyle* old = app_style; 26 QStyle* old = app_style;
113- app_style = style; 27- app_style = style;
114 28
115 if ( startingUp() ) { 29 if ( startingUp() ) {
116 delete old; 30 delete old;
117 +app_style = style; 31 +app_style = style;
118 return; 32 return;
119 } 33 }
120 34
121@@ -958,6 +965,8 @@ 35@@ -958,6 +965,8 @@
122 old->unPolish( qApp ); 36 old->unPolish( qApp );
123 } 37 }
124 38
125+ app_style = style; 39+ app_style = style;
126+ 40+
127 // take care of possible palette requirements of certain gui 41 // take care of possible palette requirements of certain gui
128 // styles. Do it before polishing the application since the style 42 // styles. Do it before polishing the application since the style
129 // might call QApplication::setStyle() itself 43 // might call QApplication::setStyle() itself
130@@ -1184,13 +1193,30 @@ 44@@ -1184,13 +1193,30 @@
131 \sa QWidget::setPalette(), palette(), QStyle::polish() 45 \sa QWidget::setPalette(), palette(), QStyle::polish()
132 */ 46 */
133 47
134-void QApplication::setPalette( const QPalette &palette, bool informWidgets, 48-void QApplication::setPalette( const QPalette &palette, bool informWidgets,
135+void QApplication::setPalette ( const QPalette &palette, bool informWidgets, 49+void QApplication::setPalette ( const QPalette &palette, bool informWidgets,
136 + const char* className ) 50 + const char* className )
137+{ 51+{
138 +setPalette_NonWeak ( palette, informWidgets, className ); 52 +setPalette_NonWeak ( palette, informWidgets, className );
139+} 53+}
140+ 54+
141+void QApplication::setPalette_NonWeak ( const QPalette &palette, bool informWidgets, 55+void QApplication::setPalette_NonWeak ( const QPalette &palette, bool informWidgets,
142 const char* className ) 56 const char* className )
143 { 57 {
144 QPalette pal = palette; 58 QPalette pal = palette;
145 #ifndef QT_NO_STYLE 59 #ifndef QT_NO_STYLE
146- if ( !startingUp() ) 60- if ( !startingUp() )
147+ if ( !startingUp() ) { 61+ if ( !startingUp() ) {
148 qApp->style().polish( pal );// NB: non-const reference 62 qApp->style().polish( pal );// NB: non-const reference
149 +if ( className ) { 63 +if ( className ) {
150 + // if we just polished a class specific palette (this normally 64 + // if we just polished a class specific palette (this normally
151 + // only called by qt_fix_tooltips - see below), we better re- 65 + // only called by qt_fix_tooltips - see below), we better re-
152 + // polish the global palette. Some styles like liquid can get 66 + // polish the global palette. Some styles like liquid can get
153 + // confused, because they can not detect if the polished palette 67 + // confused, because they can not detect if the polished palette
154 + // is the global one or only a class specific one. 68 + // is the global one or only a class specific one.
155 + // (liquid uses this palette to calculate blending pixmaps) 69 + // (liquid uses this palette to calculate blending pixmaps)
156 + QPalette p = qApp-> palette ( ); 70 + QPalette p = qApp-> palette ( );
157 + qApp->style().polish ( p ); 71 + qApp->style().polish ( p );
158 +} 72 +}
159+ } 73+ }
160 #endif 74 #endif
161 bool all = FALSE; 75 bool all = FALSE;
162 if ( !className ) { 76 if ( !className ) {
163@@ -1275,6 +1301,12 @@ 77@@ -1275,6 +1301,12 @@
164 void QApplication::setFont( const QFont &font, bool informWidgets, 78 void QApplication::setFont( const QFont &font, bool informWidgets,
165 const char* className ) 79 const char* className )
166 { 80 {
167 +setFont_NonWeak ( font, informWidgets, className ); 81 +setFont_NonWeak ( font, informWidgets, className );
168+} 82+}
169+ 83+
170+void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets, 84+void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets,
171 + const char* className ) 85 + const char* className )
172+{ 86+{
173 bool all = FALSE; 87 bool all = FALSE;
174 if ( !className ) { 88 if ( !className ) {
175 if ( !app_font ) { 89 if ( !app_font ) {
176Nur in qt-2.3.5/src/kernel: qapplication.cpp.orig. 90 --- qt-2.3.7/src/kernel/qapplication.h~qte237-all2003-07-17 03:20:25.000000000 +0200
177diff -ru qt-2.3.5_fresh/src/kernel/qapplication.h qt-2.3.5/src/kernel/qapplication.h 91 +++ qt-2.3.7/src/kernel/qapplication.h2004-04-15 21:06:51.232857014 +0200
178 --- qt-2.3.5_fresh/src/kernel/qapplication.h2003-05-13 15:56:10.000000000 +0200
179 +++ qt-2.3.5/src/kernel/qapplication.h2003-05-13 15:58:18.000000000 +0200
180@@ -61,6 +61,10 @@ 92@@ -61,6 +61,10 @@
181 class QSemaphore; 93 class QSemaphore;
182 #endif 94 #endif
183 95
184+#if !defined( QT_WEAK_SYMBOL ) 96+#if !defined( QT_WEAK_SYMBOL )
185+#define QT_WEAK_SYMBOL 97+#define QT_WEAK_SYMBOL
186+#endif 98+#endif
187+ 99+
188 // REMOVE IN 3.0 (just here for moc source compatibility) 100 // REMOVE IN 3.0 (just here for moc source compatibility)
189 #define QNonBaseApplication QApplication 101 #define QNonBaseApplication QApplication
190 102
191@@ -85,7 +89,10 @@ 103@@ -85,7 +89,10 @@
192 104
193 #ifndef QT_NO_STYLE 105 #ifndef QT_NO_STYLE
194 static QStyle &style(); 106 static QStyle &style();
195 - static void setStyle( QStyle* ); 107 - static void setStyle( QStyle* );
196 + static void setStyle( QStyle* ) QT_WEAK_SYMBOL; 108 + static void setStyle( QStyle* ) QT_WEAK_SYMBOL;
197+private: 109+private:
198 +static void setStyle_NonWeak( QStyle* ); 110 +static void setStyle_NonWeak( QStyle* );
199+public: 111+public:
200 #endif 112 #endif
201 #if 1/* OBSOLETE */ 113 #if 1/* OBSOLETE */
202 enum ColorMode { NormalColors, CustomColors }; 114 enum ColorMode { NormalColors, CustomColors };
203@@ -106,11 +113,19 @@ 115@@ -106,11 +113,19 @@
204 #ifndef QT_NO_PALETTE 116 #ifndef QT_NO_PALETTE
205 static QPalette palette( const QWidget* = 0 ); 117 static QPalette palette( const QWidget* = 0 );
206 static void setPalette( const QPalette &, bool informWidgets=FALSE, 118 static void setPalette( const QPalette &, bool informWidgets=FALSE,
207 + const char* className = 0 ) QT_WEAK_SYMBOL; 119 + const char* className = 0 ) QT_WEAK_SYMBOL;
208+private: 120+private:
209 + static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE, 121 + static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE,
210 const char* className = 0 ); 122 const char* className = 0 );
211+public: 123+public:
212 #endif 124 #endif
213 static QFont font( const QWidget* = 0 ); 125 static QFont font( const QWidget* = 0 );
214 static void setFont( const QFont &, bool informWidgets=FALSE, 126 static void setFont( const QFont &, bool informWidgets=FALSE,
215 + const char* className = 0 ) QT_WEAK_SYMBOL; 127 + const char* className = 0 ) QT_WEAK_SYMBOL;
216+private: 128+private:
217 + static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE, 129 + static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE,
218 const char* className = 0 ); 130 const char* className = 0 );
219 +public: 131 +public:
220 static QFontMetrics fontMetrics(); 132 static QFontMetrics fontMetrics();
221 133
222 QWidget *mainWidget() const; 134 QWidget *mainWidget() const;
223@@ -207,7 +222,10 @@ 135@@ -207,7 +222,10 @@
224 void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); 136 void qwsSetCustomColors( QRgb *colortable, int start, int numColors );
225 #ifndef QT_NO_QWS_MANAGER 137 #ifndef QT_NO_QWS_MANAGER
226 static QWSDecoration &qwsDecoration(); 138 static QWSDecoration &qwsDecoration();
227- static void qwsSetDecoration( QWSDecoration *); 139- static void qwsSetDecoration( QWSDecoration *);
228+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; 140+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL;
229+private: 141+private:
230+ static void qwsSetDecoration_NonWeak( QWSDecoration *); 142+ static void qwsSetDecoration_NonWeak( QWSDecoration *);
231+public: 143+public:
232 #endif 144 #endif
233 #endif 145 #endif
234 146
235diff -ru qt-2.3.5_fresh/src/kernel/qapplication_qws.cpp qt-2.3.5/src/kernel/qapplication_qws.cpp 147 --- qt-2.3.7/src/kernel/qapplication_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200
236 --- qt-2.3.5_fresh/src/kernel/qapplication_qws.cpp2003-05-13 15:56:10.000000000 +0200 148 +++ qt-2.3.7/src/kernel/qapplication_qws.cpp2004-04-15 21:06:51.234856703 +0200
237 +++ qt-2.3.5/src/kernel/qapplication_qws.cpp2003-05-13 15:58:18.000000000 +0200 149@@ -2804,6 +2804,11 @@
238@@ -2737,6 +2737,11 @@
239 */ 150 */
240 void QApplication::qwsSetDecoration( QWSDecoration *d ) 151 void QApplication::qwsSetDecoration( QWSDecoration *d )
241 { 152 {
242 +qwsSetDecoration_NonWeak ( d ); 153 +qwsSetDecoration_NonWeak ( d );
243+} 154+}
244+ 155+
245+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d ) 156+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d )
246+{ 157+{
247 if ( d ) { 158 if ( d ) {
248 delete qws_decoration; 159 delete qws_decoration;
249 qws_decoration = d; 160 qws_decoration = d;
250Nur in qt-2.3.5/src/kernel: qapplication_qws.cpp.orig. 161 --- qt-2.3.7/src/kernel/qfontdatabase.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200
251diff -ru qt-2.3.5_fresh/src/kernel/qfontdatabase.cpp qt-2.3.5/src/kernel/qfontdatabase.cpp 162 +++ qt-2.3.7/src/kernel/qfontdatabase.cpp2004-04-15 21:06:51.235856547 +0200
252 --- qt-2.3.5_fresh/src/kernel/qfontdatabase.cpp2003-05-13 15:56:11.000000000 +0200
253 +++ qt-2.3.5/src/kernel/qfontdatabase.cpp2003-05-13 15:58:18.000000000 +0200
254@@ -35,6 +35,8 @@ 163@@ -35,6 +35,8 @@
255 ** 164 **
256 **********************************************************************/ 165 **********************************************************************/
257 166
258+#define QT_WEAK_SYMBOL __attribute__(( weak )) 167+#define QT_WEAK_SYMBOL __attribute__(( weak ))
259+ 168+
260 #include "qfontdatabase.h" 169 #include "qfontdatabase.h"
261 170
262 #ifndef QT_NO_FONTDATABASE 171 #ifndef QT_NO_FONTDATABASE
263@@ -2424,6 +2426,13 @@ 172@@ -2424,6 +2426,13 @@
264 const QString &style, 173 const QString &style,
265 const QString &charSet ) 174 const QString &charSet )
266 { 175 {
267 +return pointSizes_NonWeak ( family, style, charSet ); 176 +return pointSizes_NonWeak ( family, style, charSet );
268+} 177+}
269+ 178+
270+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family, 179+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family,
271+ const QString &style, 180+ const QString &style,
272+ const QString &charSet ) 181+ const QString &charSet )
273+{ 182+{
274 QString cs( charSet ); 183 QString cs( charSet );
275 if ( charSet.isEmpty() ) { 184 if ( charSet.isEmpty() ) {
276 QStringList lst = charSets( family ); 185 QStringList lst = charSets( family );
277diff -ru qt-2.3.5_fresh/src/kernel/qfontdatabase.h qt-2.3.5/src/kernel/qfontdatabase.h 186 --- qt-2.3.7/src/kernel/qfontdatabase.h~qte237-all2003-07-17 03:20:25.000000000 +0200
278 --- qt-2.3.5_fresh/src/kernel/qfontdatabase.h2003-05-13 15:56:11.000000000 +0200 187 +++ qt-2.3.7/src/kernel/qfontdatabase.h2004-04-15 21:06:51.236856392 +0200
279 +++ qt-2.3.5/src/kernel/qfontdatabase.h2003-05-13 15:58:18.000000000 +0200
280@@ -59,6 +59,10 @@ 188@@ -59,6 +59,10 @@
281 class QDiskFont; 189 class QDiskFont;
282 #endif 190 #endif
283 191
284+#if !defined( QT_WEAK_SYMBOL ) 192+#if !defined( QT_WEAK_SYMBOL )
285+#define QT_WEAK_SYMBOL 193+#define QT_WEAK_SYMBOL
286+#endif 194+#endif
287+ 195+
288 class QFontDatabasePrivate; 196 class QFontDatabasePrivate;
289 197
290 class Q_EXPORT QFontDatabase 198 class Q_EXPORT QFontDatabase
291@@ -67,9 +71,16 @@ 199@@ -67,9 +71,16 @@
292 QFontDatabase(); 200 QFontDatabase();
293 201
294 QStringList families( bool onlyForLocale = TRUE ) const; 202 QStringList families( bool onlyForLocale = TRUE ) const;
295+ 203+
296+ 204+
297 QValueList<int> pointSizes( const QString &family, 205 QValueList<int> pointSizes( const QString &family,
298 const QString &style = QString::null, 206 const QString &style = QString::null,
299 - const QString &charSet = QString::null ); 207 - const QString &charSet = QString::null );
300 + const QString &charSet = QString::null ) QT_WEAK_SYMBOL; 208 + const QString &charSet = QString::null ) QT_WEAK_SYMBOL;
301+private: 209+private:
302+ QValueList<int> pointSizes_NonWeak( const QString &family, 210+ QValueList<int> pointSizes_NonWeak( const QString &family,
303 + const QString &style, 211 + const QString &style,
304 + const QString &charSet ); 212 + const QString &charSet );
305+public: 213+public:
306 QStringList styles( const QString &family, 214 QStringList styles( const QString &family,
307 const QString &charSet = QString::null ) const; 215 const QString &charSet = QString::null ) const;
308 QStringList charSets( const QString &familyName, 216 QStringList charSets( const QString &familyName,
309diff -ru qt-2.3.5_fresh/src/kernel/qgfxraster_qws.cpp qt-2.3.5/src/kernel/qgfxraster_qws.cpp 217 --- qt-2.3.7/src/kernel/qgfxraster_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200
310 --- qt-2.3.5_fresh/src/kernel/qgfxraster_qws.cpp2003-05-13 15:56:11.000000000 +0200 218 +++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp2004-04-15 21:06:51.238856081 +0200
311 +++ qt-2.3.5/src/kernel/qgfxraster_qws.cpp2003-05-13 15:58:18.000000000 +0200 219@@ -4237,7 +4237,7 @@
312@@ -4205,7 +4205,7 @@
313 setAlphaType(IgnoreAlpha); 220 setAlphaType(IgnoreAlpha);
314 if ( w <= 0 || h <= 0 || !ncliprect ) return; 221 if ( w <= 0 || h <= 0 || !ncliprect ) return;
315 GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1)) 222 GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1))
316-#ifdef QWS_EXPERIMENTAL_FASTPATH 223-#ifdef QWS_EXPERIMENTAL_FASTPATH
317+#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !! 224+#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !!
318 // ### fix for 8bpp 225 // ### fix for 8bpp
319 // This seems to be reliable now, at least for 16bpp 226 // This seems to be reliable now, at least for 16bpp
320 227
321Nur in qt-2.3.5/src/kernel: qgfxraster_qws.cpp.orig. 228 --- qt-2.3.7/src/kernel/qwindowsystem_qws.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200
322diff -ru qt-2.3.5_fresh/src/kernel/qwindowsystem_qws.cpp qt-2.3.5/src/kernel/qwindowsystem_qws.cpp 229 +++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp2004-04-15 21:06:51.240855770 +0200
323 --- qt-2.3.5_fresh/src/kernel/qwindowsystem_qws.cpp2003-05-13 15:56:11.000000000 +0200 230@@ -844,6 +844,18 @@
324 +++ qt-2.3.5/src/kernel/qwindowsystem_qws.cpp2003-05-13 15:58:19.000000000 +0200
325@@ -843,6 +843,18 @@
326 { 231 {
327 } 232 }
328 233
329+static void catchSegvSignal( int ) 234+static void catchSegvSignal( int )
330+{ 235+{
331+#ifndef QT_NO_QWS_KEYBOARD 236+#ifndef QT_NO_QWS_KEYBOARD
332+ if ( qwsServer ) 237+ if ( qwsServer )
333 +qwsServer->closeKeyboard(); 238 +qwsServer->closeKeyboard();
334+#endif 239+#endif
335+ QWSServer::closedown(); 240+ QWSServer::closedown();
336+ fprintf(stderr, "Segmentation fault.\n"); 241+ fprintf(stderr, "Segmentation fault.\n");
337+ exit(1); 242+ exit(1);
338+} 243+}
339+ 244+
340+ 245+
341 /*! 246 /*!
342 \class QWSServer qwindowsystem_qws.h 247 \class QWSServer qwindowsystem_qws.h
343 \brief Server-specific functionality in Qt/Embedded 248 \brief Server-specific functionality in Qt/Embedded
344@@ -912,6 +924,7 @@ 249@@ -936,6 +948,7 @@
345 } 250 }
346 251
347 signal(SIGPIPE, ignoreSignal); //we get it when we read 252 signal(SIGPIPE, ignoreSignal); //we get it when we read
348+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash 253+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash
349 #endif 254 #endif
350 focusw = 0; 255 focusw = 0;
351 mouseGrabber = 0; 256 mouseGrabber = 0;
352diff -ru qt-2.3.5_fresh/src/widgets/qcommonstyle.cpp qt-2.3.5/src/widgets/qcommonstyle.cpp 257 --- qt-2.3.7/src/widgets/qcommonstyle.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200
353 --- qt-2.3.5_fresh/src/widgets/qcommonstyle.cpp2003-05-13 15:56:12.000000000 +0200 258 +++ qt-2.3.7/src/widgets/qcommonstyle.cpp2004-04-15 21:06:51.240855770 +0200
354 +++ qt-2.3.5/src/widgets/qcommonstyle.cpp2003-05-13 15:58:19.000000000 +0200
355@@ -566,7 +566,7 @@ 259@@ -566,7 +566,7 @@
356 bool enabled, bool active ) 260 bool enabled, bool active )
357 { 261 {
358 #ifndef QT_NO_MENUBAR 262 #ifndef QT_NO_MENUBAR
359-#ifndef QT_NO_STYLE_SGI 263-#ifndef QT_NO_STYLE_SGI
360+#if 1 // #ifndef QT_NO_STYLE_SGI 264+#if 1 // #ifndef QT_NO_STYLE_SGI
361 if (draw_menu_bar_impl != 0) { 265 if (draw_menu_bar_impl != 0) {
362 QDrawMenuBarItemImpl impl = draw_menu_bar_impl; 266 QDrawMenuBarItemImpl impl = draw_menu_bar_impl;
363 (this->*impl)(p, x, y, w, h, mi, g, enabled, active); 267 (this->*impl)(p, x, y, w, h, mi, g, enabled, active);
364Nur in qt-2.3.5/src/widgets: qcommonstyle.cpp.orig. 268 --- qt-2.3.7/src/widgets/qlistview.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200
365diff -ru qt-2.3.5_fresh/src/widgets/qlistview.cpp qt-2.3.5/src/widgets/qlistview.cpp 269 +++ qt-2.3.7/src/widgets/qlistview.cpp2004-04-15 21:06:51.243855303 +0200
366 --- qt-2.3.5_fresh/src/widgets/qlistview.cpp2003-05-13 15:56:12.000000000 +0200
367 +++ qt-2.3.5/src/widgets/qlistview.cpp2003-05-13 15:58:18.000000000 +0200
368@@ -4968,9 +4968,9 @@ 270@@ -4968,9 +4968,9 @@
369 l = l->childItem ? l->childItem : l->siblingItem; 271 l = l->childItem ? l->childItem : l->siblingItem;
370 272
371 if ( l && l->height() ) 273 if ( l && l->height() )
372 -s.setHeight( s.height() + 10 * l->height() ); 274 -s.setHeight( s.height() + 10 * l->height() );
373- else 275- else
374 -s.setHeight( s.height() + 140 ); 276 -s.setHeight( s.height() + 140 );
375 +s.setHeight( s.height() + 4 /*10*/ * l->height() ); 277 +s.setHeight( s.height() + 4 /*10*/ * l->height() );
376+ else // ^v much too big for handhelds 278+ else // ^v much too big for handhelds
377 +s.setHeight( s.height() + 30 /*140*/ ); 279 +s.setHeight( s.height() + 30 /*140*/ );
378 280
379 if ( s.width() > s.height() * 3 ) 281 if ( s.width() > s.height() * 3 )
380 s.setHeight( s.width() / 3 ); 282 s.setHeight( s.width() / 3 );
381diff -ru qt-2.3.5_fresh/src/widgets/qtoolbutton.cpp qt-2.3.5/src/widgets/qtoolbutton.cpp 283 --- qt-2.3.7/src/widgets/qtoolbutton.cpp~qte237-all2003-07-17 03:20:27.000000000 +0200
382 --- qt-2.3.5_fresh/src/widgets/qtoolbutton.cpp2003-05-13 15:56:12.000000000 +0200 284 +++ qt-2.3.7/src/widgets/qtoolbutton.cpp2004-04-15 21:06:51.243855303 +0200
383 +++ qt-2.3.5/src/widgets/qtoolbutton.cpp2003-05-13 15:58:18.000000000 +0200
384@@ -230,7 +230,7 @@ 285@@ -230,7 +230,7 @@
385 else 286 else
386 QToolTip::add( this, textLabel ); 287 QToolTip::add( this, textLabel );
387 } 288 }
388 -#endif 289 -#endif
389+#endif 290+#endif
390 } 291 }
391 292
392 293
393@@ -324,12 +324,12 @@ 294@@ -324,12 +324,12 @@
394 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); 295 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal);
395 w = pm.width(); 296 w = pm.width();
396 h = pm.height(); 297 h = pm.height();
397 -if ( w < 32 ) 298 -if ( w < 32 )
398 - w = 32; 299 - w = 32;
399 -if ( h < 32 ) 300 -if ( h < 32 )
400 - h = 32; 301 - h = 32;
401 +if ( w < 24 ) 302 +if ( w < 24 )
402 + w = 24; 303 + w = 24;
403 +if ( h < 24 ) 304 +if ( h < 24 )
404 + h = 24; 305 + h = 24;
405 } else { 306 } else {
406 -w = h = 16; 307 -w = h = 16;
407 +w = h = 14; 308 +w = h = 14;
408 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); 309 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal);
409 w = pm.width(); 310 w = pm.width();
410 h = pm.height(); 311 h = pm.height();
411 --- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~c7xxrotate2003-07-16 18:20:25.000000000 -0700 312 --- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200
412 +++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp2003-12-07 15:54:10.000000000 -0800 313 +++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp2004-04-15 21:06:51.244855148 +0200
413@@ -238,7 +238,7 @@ 314@@ -238,7 +238,7 @@
414 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 63 315 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 63
415 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 64 316 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 64
416 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 65 317 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 65
417 - { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 66 318 - { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 66
418+ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 319+ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66
419 { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 320 { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67
420 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 68 321 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 68
421 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 69 322 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 69
422diff -ru qt-2.3.7/configs/linux-generic-g++-shared qte/configs/linux-generic-g++-shared 323 --- qt-2.3.7/configs/linux-generic-g++-shared~qte237-all2003-07-17 03:23:08.000000000 +0200
423 --- qt-2.3.7/configs/linux-generic-g++-shared2003-07-17 03:23:08.000000000 +0200 324 +++ qt-2.3.7/configs/linux-generic-g++-shared2004-04-15 21:06:51.244855148 +0200
424 +++ qte/configs/linux-generic-g++-shared2004-03-01 20:08:00.884254576 +0100
425@@ -36,7 +36,7 @@ 325@@ -36,7 +36,7 @@
426 SYSCONF_LIBS_YACC= 326 SYSCONF_LIBS_YACC=
427 327
428 # Linking applications 328 # Linking applications
429 -SYSCONF_LINK = gcc 329 -SYSCONF_LINK = gcc
430 +SYSCONF_LINK = g++ 330 +SYSCONF_LINK = g++
431 SYSCONF_LFLAGS = 331 SYSCONF_LFLAGS =
432 SYSCONF_LIBS = 332 SYSCONF_LIBS =
433 333
434Nur in qte/configs: linux-generic-g++-shared~. 334 --- qt-2.3.7/configs/linux-generic-g++-shared-debug~qte237-all2003-07-17 03:23:08.000000000 +0200
435diff -ru qt-2.3.7/configs/linux-generic-g++-shared-debug qte/configs/linux-generic-g++-shared-debug 335 +++ qt-2.3.7/configs/linux-generic-g++-shared-debug2004-04-15 21:06:51.244855148 +0200
436 --- qt-2.3.7/configs/linux-generic-g++-shared-debug2003-07-17 03:23:08.000000000 +0200
437 +++ qte/configs/linux-generic-g++-shared-debug2004-03-01 20:08:06.552392888 +0100
438@@ -36,7 +36,7 @@ 336@@ -36,7 +36,7 @@
439 SYSCONF_LIBS_YACC= 337 SYSCONF_LIBS_YACC=
440 338
441 # Linking applications 339 # Linking applications
442 -SYSCONF_LINK = gcc 340 -SYSCONF_LINK = gcc
443 +SYSCONF_LINK = g++ 341 +SYSCONF_LINK = g++
444 SYSCONF_LFLAGS = 342 SYSCONF_LFLAGS =
445 SYSCONF_LIBS = 343 SYSCONF_LIBS =
446 344
447Nur in qte/configs: linux-generic-g++-shared-debug~. 345 --- qt-2.3.7/configs/linux-generic-g++-static~qte237-all2003-07-17 03:23:08.000000000 +0200
448diff -ru qt-2.3.7/configs/linux-generic-g++-static qte/configs/linux-generic-g++-static 346 +++ qt-2.3.7/configs/linux-generic-g++-static2004-04-15 21:06:51.244855148 +0200
449 --- qt-2.3.7/configs/linux-generic-g++-static2003-07-17 03:23:08.000000000 +0200
450 +++ qte/configs/linux-generic-g++-static2004-03-01 20:08:11.410654320 +0100
451@@ -36,7 +36,7 @@ 347@@ -36,7 +36,7 @@
452 SYSCONF_LIBS_YACC= 348 SYSCONF_LIBS_YACC=
453 349
454 # Linking applications 350 # Linking applications
455 -SYSCONF_LINK = gcc 351 -SYSCONF_LINK = gcc
456 +SYSCONF_LINK = g++ 352 +SYSCONF_LINK = g++
457 SYSCONF_LFLAGS = 353 SYSCONF_LFLAGS =
458 SYSCONF_LIBS = 354 SYSCONF_LIBS =
459 355
460Nur in qte/configs: linux-generic-g++-static~. 356 --- qt-2.3.7/configs/linux-generic-g++-static-debug~qte237-all2003-07-17 03:23:08.000000000 +0200
461diff -ru qt-2.3.7/configs/linux-generic-g++-static-debug qte/configs/linux-generic-g++-static-debug 357 +++ qt-2.3.7/configs/linux-generic-g++-static-debug2004-04-15 21:06:51.245854992 +0200
462 --- qt-2.3.7/configs/linux-generic-g++-static-debug2003-07-17 03:23:08.000000000 +0200
463 +++ qte/configs/linux-generic-g++-static-debug2004-03-01 20:08:15.780989928 +0100
464@@ -36,7 +36,7 @@ 358@@ -36,7 +36,7 @@
465 SYSCONF_LIBS_YACC= 359 SYSCONF_LIBS_YACC=
466 360
467 # Linking applications 361 # Linking applications
468 -SYSCONF_LINK = gcc 362 -SYSCONF_LINK = gcc
469 +SYSCONF_LINK = g++ 363 +SYSCONF_LINK = g++
470 SYSCONF_LFLAGS = 364 SYSCONF_LFLAGS =
471 SYSCONF_LIBS = 365 SYSCONF_LIBS =
472 366
473Nur in qte/configs: linux-generic-g++-static-debug~. 367 --- qt-2.3.7/configs/linux-generic_rtti-g++-shared~qte237-all2003-07-17 03:23:08.000000000 +0200
474diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-shared qte/configs/linux-generic_rtti-g++-shared 368 +++ qt-2.3.7/configs/linux-generic_rtti-g++-shared2004-04-15 21:06:51.245854992 +0200
475 --- qt-2.3.7/configs/linux-generic_rtti-g++-shared2003-07-17 03:23:08.000000000 +0200
476 +++ qte/configs/linux-generic_rtti-g++-shared2004-03-01 20:08:20.393288752 +0100
477@@ -36,7 +36,7 @@ 369@@ -36,7 +36,7 @@
478 SYSCONF_LIBS_YACC= 370 SYSCONF_LIBS_YACC=
479 371
480 # Linking applications 372 # Linking applications
481 -SYSCONF_LINK = gcc 373 -SYSCONF_LINK = gcc
482 +SYSCONF_LINK = g++ 374 +SYSCONF_LINK = g++
483 SYSCONF_LFLAGS = 375 SYSCONF_LFLAGS =
484 SYSCONF_LIBS = 376 SYSCONF_LIBS =
485 377
486Nur in qte/configs: linux-generic_rtti-g++-shared~. 378 --- qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug~qte237-all2003-07-17 03:23:08.000000000 +0200
487diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug qte/configs/linux-generic_rtti-g++-shared-debug 379 +++ qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug2004-04-15 21:06:51.245854992 +0200
488 --- qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug2003-07-17 03:23:08.000000000 +0200
489 +++ qte/configs/linux-generic_rtti-g++-shared-debug2004-03-01 20:08:25.127569032 +0100
490@@ -36,7 +36,7 @@ 380@@ -36,7 +36,7 @@
491 SYSCONF_LIBS_YACC= 381 SYSCONF_LIBS_YACC=
492 382
493 # Linking applications 383 # Linking applications
494 -SYSCONF_LINK = gcc 384 -SYSCONF_LINK = gcc
495 +SYSCONF_LINK = g++ 385 +SYSCONF_LINK = g++
496 SYSCONF_LFLAGS = 386 SYSCONF_LFLAGS =
497 SYSCONF_LIBS = 387 SYSCONF_LIBS =
498 388
499Nur in qte/configs: linux-generic_rtti-g++-shared-debug~. 389 --- qt-2.3.7/configs/linux-generic_rtti-g++-static~qte237-all2003-07-17 03:23:08.000000000 +0200
500diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-static qte/configs/linux-generic_rtti-g++-static 390 +++ qt-2.3.7/configs/linux-generic_rtti-g++-static2004-04-15 21:06:51.245854992 +0200
501 --- qt-2.3.7/configs/linux-generic_rtti-g++-static2003-07-17 03:23:08.000000000 +0200
502 +++ qte/configs/linux-generic_rtti-g++-static2004-03-01 20:08:29.727869680 +0100
503@@ -36,7 +36,7 @@ 391@@ -36,7 +36,7 @@
504 SYSCONF_LIBS_YACC= 392 SYSCONF_LIBS_YACC=
505 393
506 # Linking applications 394 # Linking applications
507 -SYSCONF_LINK = gcc 395 -SYSCONF_LINK = gcc
508 +SYSCONF_LINK = g++ 396 +SYSCONF_LINK = g++
509 SYSCONF_LFLAGS = 397 SYSCONF_LFLAGS =
510 SYSCONF_LIBS = 398 SYSCONF_LIBS =
511 399
512Nur in qte/configs: linux-generic_rtti-g++-static~. 400 --- qt-2.3.7/configs/linux-generic_rtti-g++-static-debug~qte237-all2003-07-17 03:23:08.000000000 +0200
513diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-static-debug qte/configs/linux-generic_rtti-g++-static-debug 401 +++ qt-2.3.7/configs/linux-generic_rtti-g++-static-debug2004-04-15 21:06:51.245854992 +0200
514 --- qt-2.3.7/configs/linux-generic_rtti-g++-static-debug2003-07-17 03:23:08.000000000 +0200
515 +++ qte/configs/linux-generic_rtti-g++-static-debug2004-03-01 20:06:12.806684864 +0100
516@@ -36,7 +36,7 @@ 402@@ -36,7 +36,7 @@
517 SYSCONF_LIBS_YACC= 403 SYSCONF_LIBS_YACC=
518 404
519 # Linking applications 405 # Linking applications
520 -SYSCONF_LINK = gcc 406 -SYSCONF_LINK = gcc
521 +SYSCONF_LINK = g++ 407 +SYSCONF_LINK = g++
522 SYSCONF_LFLAGS = 408 SYSCONF_LFLAGS =
523 SYSCONF_LIBS = 409 SYSCONF_LIBS =
524 410
525Nur in qte/configs: linux-generic_rtti-g++-static-debug~. 411 --- qt-2.3.7/configs/linux-x86rtti-g++-shared~qte237-all2003-07-17 03:23:10.000000000 +0200
526diff -ru qt-2.3.7/configs/linux-x86rtti-g++-shared qte/configs/linux-x86rtti-g++-shared 412 +++ qt-2.3.7/configs/linux-x86rtti-g++-shared2004-04-15 21:06:51.245854992 +0200
527 --- qt-2.3.7/configs/linux-x86rtti-g++-shared2003-07-17 03:23:10.000000000 +0200
528 +++ qte/configs/linux-x86rtti-g++-shared2004-03-01 19:54:16.977507440 +0100
529@@ -36,7 +36,7 @@ 413@@ -36,7 +36,7 @@
530 SYSCONF_LIBS_YACC= 414 SYSCONF_LIBS_YACC=
531 415
532 # Linking applications 416 # Linking applications
533 -SYSCONF_LINK = gcc 417 -SYSCONF_LINK = gcc
534 +SYSCONF_LINK = g++ 418 +SYSCONF_LINK = g++
535 SYSCONF_LFLAGS = 419 SYSCONF_LFLAGS =
536 SYSCONF_LIBS = -lm 420 SYSCONF_LIBS = -lm
537 421
538diff -ru qt-2.3.7/configs/linux-x86rtti-g++-shared-debug qte/configs/linux-x86rtti-g++-shared-debug 422 --- qt-2.3.7/configs/linux-x86rtti-g++-shared-debug~qte237-all2003-07-17 03:23:10.000000000 +0200
539 --- qt-2.3.7/configs/linux-x86rtti-g++-shared-debug2003-07-17 03:23:10.000000000 +0200 423 +++ qt-2.3.7/configs/linux-x86rtti-g++-shared-debug2004-04-15 21:06:51.245854992 +0200
540 +++ qte/configs/linux-x86rtti-g++-shared-debug2004-03-01 19:54:24.064430064 +0100
541@@ -36,7 +36,7 @@ 424@@ -36,7 +36,7 @@
542 SYSCONF_LIBS_YACC= 425 SYSCONF_LIBS_YACC=
543 426
544 # Linking applications 427 # Linking applications
545 -SYSCONF_LINK = gcc 428 -SYSCONF_LINK = gcc
546 +SYSCONF_LINK = g++ 429 +SYSCONF_LINK = g++
547 SYSCONF_LFLAGS = 430 SYSCONF_LFLAGS =
548 SYSCONF_LIBS = -lm 431 SYSCONF_LIBS = -lm
549 432
550diff -ru qt-2.3.7/configs/linux-x86rtti-g++-static qte/configs/linux-x86rtti-g++-static 433 --- qt-2.3.7/configs/linux-x86rtti-g++-static~qte237-all2003-07-17 03:23:10.000000000 +0200
551 --- qt-2.3.7/configs/linux-x86rtti-g++-static2003-07-17 03:23:10.000000000 +0200 434 +++ qt-2.3.7/configs/linux-x86rtti-g++-static2004-04-15 21:06:51.246854837 +0200
552 +++ qte/configs/linux-x86rtti-g++-static2004-03-01 19:54:32.020220600 +0100
553@@ -36,7 +36,7 @@ 435@@ -36,7 +36,7 @@
554 SYSCONF_LIBS_YACC= 436 SYSCONF_LIBS_YACC=
555 437
556 # Linking applications 438 # Linking applications
557 -SYSCONF_LINK = gcc 439 -SYSCONF_LINK = gcc
558 +SYSCONF_LINK = g++ 440 +SYSCONF_LINK = g++
559 SYSCONF_LFLAGS = 441 SYSCONF_LFLAGS =
560 SYSCONF_LIBS = -lm 442 SYSCONF_LIBS = -lm
561 443
562diff -ru qt-2.3.7/configs/linux-x86rtti-g++-static-debug qte/configs/linux-x86rtti-g++-static-debug 444 --- qt-2.3.7/configs/linux-x86rtti-g++-static-debug~qte237-all2003-07-17 03:23:10.000000000 +0200
563 --- qt-2.3.7/configs/linux-x86rtti-g++-static-debug2003-07-17 03:23:10.000000000 +0200 445 +++ qt-2.3.7/configs/linux-x86rtti-g++-static-debug2004-04-15 21:06:51.246854837 +0200
564 +++ qte/configs/linux-x86rtti-g++-static-debug2004-03-01 19:54:41.434789368 +0100
565@@ -36,7 +36,7 @@ 446@@ -36,7 +36,7 @@
566 SYSCONF_LIBS_YACC= 447 SYSCONF_LIBS_YACC=
567 448
568 # Linking applications 449 # Linking applications
569 -SYSCONF_LINK = gcc 450 -SYSCONF_LINK = gcc
570 +SYSCONF_LINK = g++ 451 +SYSCONF_LINK = g++
571 SYSCONF_LFLAGS = 452 SYSCONF_LFLAGS =
572 SYSCONF_LIBS = -lm 453 SYSCONF_LIBS = -lm
454
455 --- qt-2.3.7/src/kernel/qimage.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200
456 +++ qt-2.3.7/src/kernel/qimage.cpp2004-04-15 21:07:23.293869923 +0200
457@@ -2201,7 +2201,7 @@
458 t2 = srcHeight * dstWidth;
459
460 if (((sModeQStr == "ScaleMin") && (t1 > t2)) ||
461 - ((sModeQStr == "ScaleMax") && (t2 < t2))) {
462 + ((sModeQStr == "ScaleMax") && (t1 < t2))) {
463 dstHeight = t2 / srcWidth;
464 } else if (sModeQStr != "ScaleFree") {
465 dstWidth = t1 / srcHeight;