summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-24 15:14:30 (UTC)
committer mickeyl <mickeyl>2004-04-24 15:14:30 (UTC)
commitf870c0ba65ce95e1a010de95a4fb961b0c812850 (patch) (unidiff)
tree884c7ec4318e21da03c6d787e6074155c94e931c
parent1a00a2edf5da1aa7d47c736bb718933f1c2e774b (diff)
downloadopie-f870c0ba65ce95e1a010de95a4fb961b0c812850.zip
opie-f870c0ba65ce95e1a010de95a4fb961b0c812850.tar.gz
opie-f870c0ba65ce95e1a010de95a4fb961b0c812850.tar.bz2
add gcc 3.4 fixlet to qt-2.3.7 (qsortedlist.h needs a this-> before clear())
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qt-2.3.7.patch/qte237-all.patch59
1 files changed, 35 insertions, 24 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-all.patch b/qt/qt-2.3.7.patch/qte237-all.patch
index 596db2f..c71cf02 100644
--- a/qt/qt-2.3.7.patch/qte237-all.patch
+++ b/qt/qt-2.3.7.patch/qte237-all.patch
@@ -1,39 +1,39 @@
1 1
2# 2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher 3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4# 4#
5 5
6 --- qt-2.3.7/src/kernel/qapplication.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 6 --- qt-2.3.7/src/kernel/qapplication.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200
7 +++ qt-2.3.7/src/kernel/qapplication.cpp2004-04-15 21:06:51.232857014 +0200 7 +++ qt-2.3.7/src/kernel/qapplication.cpp2004-04-24 17:12:59.000000000 +0200
8@@ -35,6 +35,8 @@ 8@@ -35,6 +35,8 @@
9 ** 9 **
10 **********************************************************************/ 10 **********************************************************************/
11 11
12 +#define QT_WEAK_SYMBOL__attribute__(( weak )) 12 +#define QT_WEAK_SYMBOL__attribute__(( weak ))
13+ 13+
14 #include "qobjectlist.h" 14 #include "qobjectlist.h"
15 #include "qobjectdict.h" 15 #include "qobjectdict.h"
16 #include "qapplication.h" 16 #include "qapplication.h"
17@@ -933,11 +935,16 @@ 17@@ -933,11 +935,16 @@
18 #ifndef QT_NO_STYLE 18 #ifndef QT_NO_STYLE
19 void QApplication::setStyle( QStyle *style ) 19 void QApplication::setStyle( QStyle *style )
20 { 20 {
21 +setStyle_NonWeak ( style ); 21 +setStyle_NonWeak ( style );
22+} 22+}
23+ 23+
24+void QApplication::setStyle_NonWeak( QStyle *style ) 24+void QApplication::setStyle_NonWeak( QStyle *style )
25+{ 25+{
26 QStyle* old = app_style; 26 QStyle* old = app_style;
27- app_style = style; 27- app_style = style;
28 28
29 if ( startingUp() ) { 29 if ( startingUp() ) {
30 delete old; 30 delete old;
31 +app_style = style; 31 +app_style = style;
32 return; 32 return;
33 } 33 }
34 34
35@@ -958,6 +965,8 @@ 35@@ -958,6 +965,8 @@
36 old->unPolish( qApp ); 36 old->unPolish( qApp );
37 } 37 }
38 38
39+ app_style = style; 39+ app_style = style;
@@ -59,407 +59,418 @@
59 #ifndef QT_NO_STYLE 59 #ifndef QT_NO_STYLE
60- if ( !startingUp() ) 60- if ( !startingUp() )
61+ if ( !startingUp() ) { 61+ if ( !startingUp() ) {
62 qApp->style().polish( pal );// NB: non-const reference 62 qApp->style().polish( pal );// NB: non-const reference
63 +if ( className ) { 63 +if ( className ) {
64 + // if we just polished a class specific palette (this normally 64 + // if we just polished a class specific palette (this normally
65 + // only called by qt_fix_tooltips - see below), we better re- 65 + // only called by qt_fix_tooltips - see below), we better re-
66 + // polish the global palette. Some styles like liquid can get 66 + // polish the global palette. Some styles like liquid can get
67 + // confused, because they can not detect if the polished palette 67 + // confused, because they can not detect if the polished palette
68 + // is the global one or only a class specific one. 68 + // is the global one or only a class specific one.
69 + // (liquid uses this palette to calculate blending pixmaps) 69 + // (liquid uses this palette to calculate blending pixmaps)
70 + QPalette p = qApp-> palette ( ); 70 + QPalette p = qApp-> palette ( );
71 + qApp->style().polish ( p ); 71 + qApp->style().polish ( p );
72 +} 72 +}
73+ } 73+ }
74 #endif 74 #endif
75 bool all = FALSE; 75 bool all = FALSE;
76 if ( !className ) { 76 if ( !className ) {
77@@ -1275,6 +1301,12 @@ 77@@ -1275,6 +1301,12 @@
78 void QApplication::setFont( const QFont &font, bool informWidgets, 78 void QApplication::setFont( const QFont &font, bool informWidgets,
79 const char* className ) 79 const char* className )
80 { 80 {
81 +setFont_NonWeak ( font, informWidgets, className ); 81 +setFont_NonWeak ( font, informWidgets, className );
82+} 82+}
83+ 83+
84+void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets, 84+void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets,
85 + const char* className ) 85 + const char* className )
86+{ 86+{
87 bool all = FALSE; 87 bool all = FALSE;
88 if ( !className ) { 88 if ( !className ) {
89 if ( !app_font ) { 89 if ( !app_font ) {
90 --- qt-2.3.7/src/kernel/qapplication.h~qte237-all2003-07-17 03:20:25.000000000 +0200 90 --- qt-2.3.7/src/kernel/qapplication.h~qte237-all2003-07-17 03:20:25.000000000 +0200
91 +++ qt-2.3.7/src/kernel/qapplication.h2004-04-15 21:06:51.232857014 +0200 91 +++ qt-2.3.7/src/kernel/qapplication.h2004-04-24 17:12:59.000000000 +0200
92@@ -61,6 +61,10 @@ 92@@ -61,6 +61,10 @@
93 class QSemaphore; 93 class QSemaphore;
94 #endif 94 #endif
95 95
96+#if !defined( QT_WEAK_SYMBOL ) 96+#if !defined( QT_WEAK_SYMBOL )
97+#define QT_WEAK_SYMBOL 97+#define QT_WEAK_SYMBOL
98+#endif 98+#endif
99+ 99+
100 // REMOVE IN 3.0 (just here for moc source compatibility) 100 // REMOVE IN 3.0 (just here for moc source compatibility)
101 #define QNonBaseApplication QApplication 101 #define QNonBaseApplication QApplication
102 102
103@@ -85,7 +89,10 @@ 103@@ -85,7 +89,10 @@
104 104
105 #ifndef QT_NO_STYLE 105 #ifndef QT_NO_STYLE
106 static QStyle &style(); 106 static QStyle &style();
107 - static void setStyle( QStyle* ); 107 - static void setStyle( QStyle* );
108 + static void setStyle( QStyle* ) QT_WEAK_SYMBOL; 108 + static void setStyle( QStyle* ) QT_WEAK_SYMBOL;
109+private: 109+private:
110 +static void setStyle_NonWeak( QStyle* ); 110 +static void setStyle_NonWeak( QStyle* );
111+public: 111+public:
112 #endif 112 #endif
113 #if 1/* OBSOLETE */ 113 #if 1/* OBSOLETE */
114 enum ColorMode { NormalColors, CustomColors }; 114 enum ColorMode { NormalColors, CustomColors };
115@@ -106,11 +113,19 @@ 115@@ -106,11 +113,19 @@
116 #ifndef QT_NO_PALETTE 116 #ifndef QT_NO_PALETTE
117 static QPalette palette( const QWidget* = 0 ); 117 static QPalette palette( const QWidget* = 0 );
118 static void setPalette( const QPalette &, bool informWidgets=FALSE, 118 static void setPalette( const QPalette &, bool informWidgets=FALSE,
119 + const char* className = 0 ) QT_WEAK_SYMBOL; 119 + const char* className = 0 ) QT_WEAK_SYMBOL;
120+private: 120+private:
121 + static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE, 121 + static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE,
122 const char* className = 0 ); 122 const char* className = 0 );
123+public: 123+public:
124 #endif 124 #endif
125 static QFont font( const QWidget* = 0 ); 125 static QFont font( const QWidget* = 0 );
126 static void setFont( const QFont &, bool informWidgets=FALSE, 126 static void setFont( const QFont &, bool informWidgets=FALSE,
127 + const char* className = 0 ) QT_WEAK_SYMBOL; 127 + const char* className = 0 ) QT_WEAK_SYMBOL;
128+private: 128+private:
129 + static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE, 129 + static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE,
130 const char* className = 0 ); 130 const char* className = 0 );
131 +public: 131 +public:
132 static QFontMetrics fontMetrics(); 132 static QFontMetrics fontMetrics();
133 133
134 QWidget *mainWidget() const; 134 QWidget *mainWidget() const;
135@@ -207,7 +222,10 @@ 135@@ -207,7 +222,10 @@
136 void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); 136 void qwsSetCustomColors( QRgb *colortable, int start, int numColors );
137 #ifndef QT_NO_QWS_MANAGER 137 #ifndef QT_NO_QWS_MANAGER
138 static QWSDecoration &qwsDecoration(); 138 static QWSDecoration &qwsDecoration();
139- static void qwsSetDecoration( QWSDecoration *); 139- static void qwsSetDecoration( QWSDecoration *);
140+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; 140+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL;
141+private: 141+private:
142+ static void qwsSetDecoration_NonWeak( QWSDecoration *); 142+ static void qwsSetDecoration_NonWeak( QWSDecoration *);
143+public: 143+public:
144 #endif 144 #endif
145 #endif 145 #endif
146 146
147 --- qt-2.3.7/src/kernel/qapplication_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 147 --- qt-2.3.7/src/kernel/qapplication_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200
148 +++ qt-2.3.7/src/kernel/qapplication_qws.cpp2004-04-15 21:06:51.234856703 +0200 148 +++ qt-2.3.7/src/kernel/qapplication_qws.cpp2004-04-24 17:12:59.000000000 +0200
149@@ -2804,6 +2804,11 @@ 149@@ -2804,6 +2804,11 @@
150 */ 150 */
151 void QApplication::qwsSetDecoration( QWSDecoration *d ) 151 void QApplication::qwsSetDecoration( QWSDecoration *d )
152 { 152 {
153 +qwsSetDecoration_NonWeak ( d ); 153 +qwsSetDecoration_NonWeak ( d );
154+} 154+}
155+ 155+
156+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d ) 156+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d )
157+{ 157+{
158 if ( d ) { 158 if ( d ) {
159 delete qws_decoration; 159 delete qws_decoration;
160 qws_decoration = d; 160 qws_decoration = d;
161 --- qt-2.3.7/src/kernel/qfontdatabase.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 161 --- qt-2.3.7/src/kernel/qfontdatabase.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200
162 +++ qt-2.3.7/src/kernel/qfontdatabase.cpp2004-04-15 21:06:51.235856547 +0200 162 +++ qt-2.3.7/src/kernel/qfontdatabase.cpp2004-04-24 17:12:59.000000000 +0200
163@@ -35,6 +35,8 @@ 163@@ -35,6 +35,8 @@
164 ** 164 **
165 **********************************************************************/ 165 **********************************************************************/
166 166
167+#define QT_WEAK_SYMBOL __attribute__(( weak )) 167+#define QT_WEAK_SYMBOL __attribute__(( weak ))
168+ 168+
169 #include "qfontdatabase.h" 169 #include "qfontdatabase.h"
170 170
171 #ifndef QT_NO_FONTDATABASE 171 #ifndef QT_NO_FONTDATABASE
172@@ -2424,6 +2426,13 @@ 172@@ -2424,6 +2426,13 @@
173 const QString &style, 173 const QString &style,
174 const QString &charSet ) 174 const QString &charSet )
175 { 175 {
176 +return pointSizes_NonWeak ( family, style, charSet ); 176 +return pointSizes_NonWeak ( family, style, charSet );
177+} 177+}
178+ 178+
179+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family, 179+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family,
180+ const QString &style, 180+ const QString &style,
181+ const QString &charSet ) 181+ const QString &charSet )
182+{ 182+{
183 QString cs( charSet ); 183 QString cs( charSet );
184 if ( charSet.isEmpty() ) { 184 if ( charSet.isEmpty() ) {
185 QStringList lst = charSets( family ); 185 QStringList lst = charSets( family );
186 --- qt-2.3.7/src/kernel/qfontdatabase.h~qte237-all2003-07-17 03:20:25.000000000 +0200 186 --- qt-2.3.7/src/kernel/qfontdatabase.h~qte237-all2003-07-17 03:20:25.000000000 +0200
187 +++ qt-2.3.7/src/kernel/qfontdatabase.h2004-04-15 21:06:51.236856392 +0200 187 +++ qt-2.3.7/src/kernel/qfontdatabase.h2004-04-24 17:12:59.000000000 +0200
188@@ -59,6 +59,10 @@ 188@@ -59,6 +59,10 @@
189 class QDiskFont; 189 class QDiskFont;
190 #endif 190 #endif
191 191
192+#if !defined( QT_WEAK_SYMBOL ) 192+#if !defined( QT_WEAK_SYMBOL )
193+#define QT_WEAK_SYMBOL 193+#define QT_WEAK_SYMBOL
194+#endif 194+#endif
195+ 195+
196 class QFontDatabasePrivate; 196 class QFontDatabasePrivate;
197 197
198 class Q_EXPORT QFontDatabase 198 class Q_EXPORT QFontDatabase
199@@ -67,9 +71,16 @@ 199@@ -67,9 +71,16 @@
200 QFontDatabase(); 200 QFontDatabase();
201 201
202 QStringList families( bool onlyForLocale = TRUE ) const; 202 QStringList families( bool onlyForLocale = TRUE ) const;
203+ 203+
204+ 204+
205 QValueList<int> pointSizes( const QString &family, 205 QValueList<int> pointSizes( const QString &family,
206 const QString &style = QString::null, 206 const QString &style = QString::null,
207 - const QString &charSet = QString::null ); 207 - const QString &charSet = QString::null );
208 + const QString &charSet = QString::null ) QT_WEAK_SYMBOL; 208 + const QString &charSet = QString::null ) QT_WEAK_SYMBOL;
209+private: 209+private:
210+ QValueList<int> pointSizes_NonWeak( const QString &family, 210+ QValueList<int> pointSizes_NonWeak( const QString &family,
211 + const QString &style, 211 + const QString &style,
212 + const QString &charSet ); 212 + const QString &charSet );
213+public: 213+public:
214 QStringList styles( const QString &family, 214 QStringList styles( const QString &family,
215 const QString &charSet = QString::null ) const; 215 const QString &charSet = QString::null ) const;
216 QStringList charSets( const QString &familyName, 216 QStringList charSets( const QString &familyName,
217 --- qt-2.3.7/src/kernel/qgfxraster_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 217 --- qt-2.3.7/src/kernel/qgfxraster_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200
218 +++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp2004-04-15 21:06:51.238856081 +0200 218 +++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp2004-04-24 17:12:59.000000000 +0200
219@@ -4237,7 +4237,7 @@ 219@@ -4237,7 +4237,7 @@
220 setAlphaType(IgnoreAlpha); 220 setAlphaType(IgnoreAlpha);
221 if ( w <= 0 || h <= 0 || !ncliprect ) return; 221 if ( w <= 0 || h <= 0 || !ncliprect ) return;
222 GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1)) 222 GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1))
223-#ifdef QWS_EXPERIMENTAL_FASTPATH 223-#ifdef QWS_EXPERIMENTAL_FASTPATH
224+#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 !!
225 // ### fix for 8bpp 225 // ### fix for 8bpp
226 // This seems to be reliable now, at least for 16bpp 226 // This seems to be reliable now, at least for 16bpp
227 227
228 --- qt-2.3.7/src/kernel/qwindowsystem_qws.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200 228 --- qt-2.3.7/src/kernel/qwindowsystem_qws.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200
229 +++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp2004-04-15 21:06:51.240855770 +0200 229 +++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp2004-04-24 17:12:59.000000000 +0200
230@@ -844,6 +844,18 @@ 230@@ -844,6 +844,18 @@
231 { 231 {
232 } 232 }
233 233
234+static void catchSegvSignal( int ) 234+static void catchSegvSignal( int )
235+{ 235+{
236+#ifndef QT_NO_QWS_KEYBOARD 236+#ifndef QT_NO_QWS_KEYBOARD
237+ if ( qwsServer ) 237+ if ( qwsServer )
238 +qwsServer->closeKeyboard(); 238 +qwsServer->closeKeyboard();
239+#endif 239+#endif
240+ QWSServer::closedown(); 240+ QWSServer::closedown();
241+ fprintf(stderr, "Segmentation fault.\n"); 241+ fprintf(stderr, "Segmentation fault.\n");
242+ exit(1); 242+ exit(1);
243+} 243+}
244+ 244+
245+ 245+
246 /*! 246 /*!
247 \class QWSServer qwindowsystem_qws.h 247 \class QWSServer qwindowsystem_qws.h
248 \brief Server-specific functionality in Qt/Embedded 248 \brief Server-specific functionality in Qt/Embedded
249@@ -936,6 +948,7 @@ 249@@ -936,6 +948,7 @@
250 } 250 }
251 251
252 signal(SIGPIPE, ignoreSignal); //we get it when we read 252 signal(SIGPIPE, ignoreSignal); //we get it when we read
253+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash 253+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash
254 #endif 254 #endif
255 focusw = 0; 255 focusw = 0;
256 mouseGrabber = 0; 256 mouseGrabber = 0;
257 --- qt-2.3.7/src/widgets/qcommonstyle.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200 257 --- qt-2.3.7/src/widgets/qcommonstyle.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200
258 +++ qt-2.3.7/src/widgets/qcommonstyle.cpp2004-04-15 21:06:51.240855770 +0200 258 +++ qt-2.3.7/src/widgets/qcommonstyle.cpp2004-04-24 17:12:59.000000000 +0200
259@@ -566,7 +566,7 @@ 259@@ -566,7 +566,7 @@
260 bool enabled, bool active ) 260 bool enabled, bool active )
261 { 261 {
262 #ifndef QT_NO_MENUBAR 262 #ifndef QT_NO_MENUBAR
263-#ifndef QT_NO_STYLE_SGI 263-#ifndef QT_NO_STYLE_SGI
264+#if 1 // #ifndef QT_NO_STYLE_SGI 264+#if 1 // #ifndef QT_NO_STYLE_SGI
265 if (draw_menu_bar_impl != 0) { 265 if (draw_menu_bar_impl != 0) {
266 QDrawMenuBarItemImpl impl = draw_menu_bar_impl; 266 QDrawMenuBarItemImpl impl = draw_menu_bar_impl;
267 (this->*impl)(p, x, y, w, h, mi, g, enabled, active); 267 (this->*impl)(p, x, y, w, h, mi, g, enabled, active);
268 --- qt-2.3.7/src/widgets/qlistview.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200 268 --- qt-2.3.7/src/widgets/qlistview.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200
269 +++ qt-2.3.7/src/widgets/qlistview.cpp2004-04-15 21:06:51.243855303 +0200 269 +++ qt-2.3.7/src/widgets/qlistview.cpp2004-04-24 17:12:59.000000000 +0200
270@@ -4968,9 +4968,9 @@ 270@@ -4968,9 +4968,9 @@
271 l = l->childItem ? l->childItem : l->siblingItem; 271 l = l->childItem ? l->childItem : l->siblingItem;
272 272
273 if ( l && l->height() ) 273 if ( l && l->height() )
274 -s.setHeight( s.height() + 10 * l->height() ); 274 -s.setHeight( s.height() + 10 * l->height() );
275- else 275- else
276 -s.setHeight( s.height() + 140 ); 276 -s.setHeight( s.height() + 140 );
277 +s.setHeight( s.height() + 4 /*10*/ * l->height() ); 277 +s.setHeight( s.height() + 4 /*10*/ * l->height() );
278+ else // ^v much too big for handhelds 278+ else // ^v much too big for handhelds
279 +s.setHeight( s.height() + 30 /*140*/ ); 279 +s.setHeight( s.height() + 30 /*140*/ );
280 280
281 if ( s.width() > s.height() * 3 ) 281 if ( s.width() > s.height() * 3 )
282 s.setHeight( s.width() / 3 ); 282 s.setHeight( s.width() / 3 );
283 --- qt-2.3.7/src/widgets/qtoolbutton.cpp~qte237-all2003-07-17 03:20:27.000000000 +0200 283 --- qt-2.3.7/src/widgets/qtoolbutton.cpp~qte237-all2003-07-17 03:20:27.000000000 +0200
284 +++ qt-2.3.7/src/widgets/qtoolbutton.cpp2004-04-15 21:06:51.243855303 +0200 284 +++ qt-2.3.7/src/widgets/qtoolbutton.cpp2004-04-24 17:12:59.000000000 +0200
285@@ -230,7 +230,7 @@ 285@@ -230,7 +230,7 @@
286 else 286 else
287 QToolTip::add( this, textLabel ); 287 QToolTip::add( this, textLabel );
288 } 288 }
289 -#endif 289 -#endif
290+#endif 290+#endif
291 } 291 }
292 292
293 293
294@@ -324,12 +324,12 @@ 294@@ -324,12 +324,12 @@
295 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); 295 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal);
296 w = pm.width(); 296 w = pm.width();
297 h = pm.height(); 297 h = pm.height();
298 -if ( w < 32 ) 298 -if ( w < 32 )
299 - w = 32; 299 - w = 32;
300 -if ( h < 32 ) 300 -if ( h < 32 )
301 - h = 32; 301 - h = 32;
302 +if ( w < 24 ) 302 +if ( w < 24 )
303 + w = 24; 303 + w = 24;
304 +if ( h < 24 ) 304 +if ( h < 24 )
305 + h = 24; 305 + h = 24;
306 } else { 306 } else {
307 -w = h = 16; 307 -w = h = 16;
308 +w = h = 14; 308 +w = h = 14;
309 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); 309 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal);
310 w = pm.width(); 310 w = pm.width();
311 h = pm.height(); 311 h = pm.height();
312 --- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 312 --- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200
313 +++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp2004-04-15 21:06:51.244855148 +0200 313 +++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp2004-04-24 17:12:59.000000000 +0200
314@@ -238,7 +238,7 @@ 314@@ -238,7 +238,7 @@
315 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 63 315 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 63
316 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 64 316 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 64
317 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 65 317 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 65
318 - { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 66 318 - { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 66
319+ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 319+ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66
320 { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 320 { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67
321 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 68 321 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 68
322 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 69 322 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 69
323 --- qt-2.3.7/configs/linux-generic-g++-shared~qte237-all2003-07-17 03:23:08.000000000 +0200 323 --- qt-2.3.7/configs/linux-generic-g++-shared~qte237-all2003-07-17 03:23:08.000000000 +0200
324 +++ qt-2.3.7/configs/linux-generic-g++-shared2004-04-15 21:06:51.244855148 +0200 324 +++ qt-2.3.7/configs/linux-generic-g++-shared2004-04-24 17:12:59.000000000 +0200
325@@ -36,7 +36,7 @@ 325@@ -36,7 +36,7 @@
326 SYSCONF_LIBS_YACC= 326 SYSCONF_LIBS_YACC=
327 327
328 # Linking applications 328 # Linking applications
329 -SYSCONF_LINK = gcc 329 -SYSCONF_LINK = gcc
330 +SYSCONF_LINK = g++ 330 +SYSCONF_LINK = g++
331 SYSCONF_LFLAGS = 331 SYSCONF_LFLAGS =
332 SYSCONF_LIBS = 332 SYSCONF_LIBS =
333 333
334 --- qt-2.3.7/configs/linux-generic-g++-shared-debug~qte237-all2003-07-17 03:23:08.000000000 +0200 334 --- qt-2.3.7/configs/linux-generic-g++-shared-debug~qte237-all2003-07-17 03:23:08.000000000 +0200
335 +++ qt-2.3.7/configs/linux-generic-g++-shared-debug2004-04-15 21:06:51.244855148 +0200 335 +++ qt-2.3.7/configs/linux-generic-g++-shared-debug2004-04-24 17:12:59.000000000 +0200
336@@ -36,7 +36,7 @@ 336@@ -36,7 +36,7 @@
337 SYSCONF_LIBS_YACC= 337 SYSCONF_LIBS_YACC=
338 338
339 # Linking applications 339 # Linking applications
340 -SYSCONF_LINK = gcc 340 -SYSCONF_LINK = gcc
341 +SYSCONF_LINK = g++ 341 +SYSCONF_LINK = g++
342 SYSCONF_LFLAGS = 342 SYSCONF_LFLAGS =
343 SYSCONF_LIBS = 343 SYSCONF_LIBS =
344 344
345 --- qt-2.3.7/configs/linux-generic-g++-static~qte237-all2003-07-17 03:23:08.000000000 +0200 345 --- qt-2.3.7/configs/linux-generic-g++-static~qte237-all2003-07-17 03:23:08.000000000 +0200
346 +++ qt-2.3.7/configs/linux-generic-g++-static2004-04-15 21:06:51.244855148 +0200 346 +++ qt-2.3.7/configs/linux-generic-g++-static2004-04-24 17:12:59.000000000 +0200
347@@ -36,7 +36,7 @@ 347@@ -36,7 +36,7 @@
348 SYSCONF_LIBS_YACC= 348 SYSCONF_LIBS_YACC=
349 349
350 # Linking applications 350 # Linking applications
351 -SYSCONF_LINK = gcc 351 -SYSCONF_LINK = gcc
352 +SYSCONF_LINK = g++ 352 +SYSCONF_LINK = g++
353 SYSCONF_LFLAGS = 353 SYSCONF_LFLAGS =
354 SYSCONF_LIBS = 354 SYSCONF_LIBS =
355 355
356 --- qt-2.3.7/configs/linux-generic-g++-static-debug~qte237-all2003-07-17 03:23:08.000000000 +0200 356 --- qt-2.3.7/configs/linux-generic-g++-static-debug~qte237-all2003-07-17 03:23:08.000000000 +0200
357 +++ qt-2.3.7/configs/linux-generic-g++-static-debug2004-04-15 21:06:51.245854992 +0200 357 +++ qt-2.3.7/configs/linux-generic-g++-static-debug2004-04-24 17:12:59.000000000 +0200
358@@ -36,7 +36,7 @@ 358@@ -36,7 +36,7 @@
359 SYSCONF_LIBS_YACC= 359 SYSCONF_LIBS_YACC=
360 360
361 # Linking applications 361 # Linking applications
362 -SYSCONF_LINK = gcc 362 -SYSCONF_LINK = gcc
363 +SYSCONF_LINK = g++ 363 +SYSCONF_LINK = g++
364 SYSCONF_LFLAGS = 364 SYSCONF_LFLAGS =
365 SYSCONF_LIBS = 365 SYSCONF_LIBS =
366 366
367 --- qt-2.3.7/configs/linux-generic_rtti-g++-shared~qte237-all2003-07-17 03:23:08.000000000 +0200 367 --- qt-2.3.7/configs/linux-generic_rtti-g++-shared~qte237-all2003-07-17 03:23:08.000000000 +0200
368 +++ qt-2.3.7/configs/linux-generic_rtti-g++-shared2004-04-15 21:06:51.245854992 +0200 368 +++ qt-2.3.7/configs/linux-generic_rtti-g++-shared2004-04-24 17:12:59.000000000 +0200
369@@ -36,7 +36,7 @@ 369@@ -36,7 +36,7 @@
370 SYSCONF_LIBS_YACC= 370 SYSCONF_LIBS_YACC=
371 371
372 # Linking applications 372 # Linking applications
373 -SYSCONF_LINK = gcc 373 -SYSCONF_LINK = gcc
374 +SYSCONF_LINK = g++ 374 +SYSCONF_LINK = g++
375 SYSCONF_LFLAGS = 375 SYSCONF_LFLAGS =
376 SYSCONF_LIBS = 376 SYSCONF_LIBS =
377 377
378 --- qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug~qte237-all2003-07-17 03:23:08.000000000 +0200 378 --- qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug~qte237-all2003-07-17 03:23:08.000000000 +0200
379 +++ qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug2004-04-15 21:06:51.245854992 +0200 379 +++ qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug2004-04-24 17:12:59.000000000 +0200
380@@ -36,7 +36,7 @@ 380@@ -36,7 +36,7 @@
381 SYSCONF_LIBS_YACC= 381 SYSCONF_LIBS_YACC=
382 382
383 # Linking applications 383 # Linking applications
384 -SYSCONF_LINK = gcc 384 -SYSCONF_LINK = gcc
385 +SYSCONF_LINK = g++ 385 +SYSCONF_LINK = g++
386 SYSCONF_LFLAGS = 386 SYSCONF_LFLAGS =
387 SYSCONF_LIBS = 387 SYSCONF_LIBS =
388 388
389 --- qt-2.3.7/configs/linux-generic_rtti-g++-static~qte237-all2003-07-17 03:23:08.000000000 +0200 389 --- qt-2.3.7/configs/linux-generic_rtti-g++-static~qte237-all2003-07-17 03:23:08.000000000 +0200
390 +++ qt-2.3.7/configs/linux-generic_rtti-g++-static2004-04-15 21:06:51.245854992 +0200 390 +++ qt-2.3.7/configs/linux-generic_rtti-g++-static2004-04-24 17:12:59.000000000 +0200
391@@ -36,7 +36,7 @@ 391@@ -36,7 +36,7 @@
392 SYSCONF_LIBS_YACC= 392 SYSCONF_LIBS_YACC=
393 393
394 # Linking applications 394 # Linking applications
395 -SYSCONF_LINK = gcc 395 -SYSCONF_LINK = gcc
396 +SYSCONF_LINK = g++ 396 +SYSCONF_LINK = g++
397 SYSCONF_LFLAGS = 397 SYSCONF_LFLAGS =
398 SYSCONF_LIBS = 398 SYSCONF_LIBS =
399 399
400 --- qt-2.3.7/configs/linux-generic_rtti-g++-static-debug~qte237-all2003-07-17 03:23:08.000000000 +0200 400 --- qt-2.3.7/configs/linux-generic_rtti-g++-static-debug~qte237-all2003-07-17 03:23:08.000000000 +0200
401 +++ qt-2.3.7/configs/linux-generic_rtti-g++-static-debug2004-04-15 21:06:51.245854992 +0200 401 +++ qt-2.3.7/configs/linux-generic_rtti-g++-static-debug2004-04-24 17:12:59.000000000 +0200
402@@ -36,7 +36,7 @@ 402@@ -36,7 +36,7 @@
403 SYSCONF_LIBS_YACC= 403 SYSCONF_LIBS_YACC=
404 404
405 # Linking applications 405 # Linking applications
406 -SYSCONF_LINK = gcc 406 -SYSCONF_LINK = gcc
407 +SYSCONF_LINK = g++ 407 +SYSCONF_LINK = g++
408 SYSCONF_LFLAGS = 408 SYSCONF_LFLAGS =
409 SYSCONF_LIBS = 409 SYSCONF_LIBS =
410 410
411 --- qt-2.3.7/configs/linux-x86rtti-g++-shared~qte237-all2003-07-17 03:23:10.000000000 +0200 411 --- qt-2.3.7/configs/linux-x86rtti-g++-shared~qte237-all2003-07-17 03:23:10.000000000 +0200
412 +++ qt-2.3.7/configs/linux-x86rtti-g++-shared2004-04-15 21:06:51.245854992 +0200 412 +++ qt-2.3.7/configs/linux-x86rtti-g++-shared2004-04-24 17:12:59.000000000 +0200
413@@ -36,7 +36,7 @@ 413@@ -36,7 +36,7 @@
414 SYSCONF_LIBS_YACC= 414 SYSCONF_LIBS_YACC=
415 415
416 # Linking applications 416 # Linking applications
417 -SYSCONF_LINK = gcc 417 -SYSCONF_LINK = gcc
418 +SYSCONF_LINK = g++ 418 +SYSCONF_LINK = g++
419 SYSCONF_LFLAGS = 419 SYSCONF_LFLAGS =
420 SYSCONF_LIBS = -lm 420 SYSCONF_LIBS = -lm
421 421
422 --- qt-2.3.7/configs/linux-x86rtti-g++-shared-debug~qte237-all2003-07-17 03:23:10.000000000 +0200 422 --- qt-2.3.7/configs/linux-x86rtti-g++-shared-debug~qte237-all2003-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 423 +++ qt-2.3.7/configs/linux-x86rtti-g++-shared-debug2004-04-24 17:12:59.000000000 +0200
424@@ -36,7 +36,7 @@ 424@@ -36,7 +36,7 @@
425 SYSCONF_LIBS_YACC= 425 SYSCONF_LIBS_YACC=
426 426
427 # Linking applications 427 # Linking applications
428 -SYSCONF_LINK = gcc 428 -SYSCONF_LINK = gcc
429 +SYSCONF_LINK = g++ 429 +SYSCONF_LINK = g++
430 SYSCONF_LFLAGS = 430 SYSCONF_LFLAGS =
431 SYSCONF_LIBS = -lm 431 SYSCONF_LIBS = -lm
432 432
433 --- qt-2.3.7/configs/linux-x86rtti-g++-static~qte237-all2003-07-17 03:23:10.000000000 +0200 433 --- qt-2.3.7/configs/linux-x86rtti-g++-static~qte237-all2003-07-17 03:23:10.000000000 +0200
434 +++ qt-2.3.7/configs/linux-x86rtti-g++-static2004-04-15 21:06:51.246854837 +0200 434 +++ qt-2.3.7/configs/linux-x86rtti-g++-static2004-04-24 17:12:59.000000000 +0200
435@@ -36,7 +36,7 @@ 435@@ -36,7 +36,7 @@
436 SYSCONF_LIBS_YACC= 436 SYSCONF_LIBS_YACC=
437 437
438 # Linking applications 438 # Linking applications
439 -SYSCONF_LINK = gcc 439 -SYSCONF_LINK = gcc
440 +SYSCONF_LINK = g++ 440 +SYSCONF_LINK = g++
441 SYSCONF_LFLAGS = 441 SYSCONF_LFLAGS =
442 SYSCONF_LIBS = -lm 442 SYSCONF_LIBS = -lm
443 443
444 --- qt-2.3.7/configs/linux-x86rtti-g++-static-debug~qte237-all2003-07-17 03:23:10.000000000 +0200 444 --- qt-2.3.7/configs/linux-x86rtti-g++-static-debug~qte237-all2003-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 445 +++ qt-2.3.7/configs/linux-x86rtti-g++-static-debug2004-04-24 17:12:59.000000000 +0200
446@@ -36,7 +36,7 @@ 446@@ -36,7 +36,7 @@
447 SYSCONF_LIBS_YACC= 447 SYSCONF_LIBS_YACC=
448 448
449 # Linking applications 449 # Linking applications
450 -SYSCONF_LINK = gcc 450 -SYSCONF_LINK = gcc
451 +SYSCONF_LINK = g++ 451 +SYSCONF_LINK = g++
452 SYSCONF_LFLAGS = 452 SYSCONF_LFLAGS =
453 SYSCONF_LIBS = -lm 453 SYSCONF_LIBS = -lm
454 454
455 --- qt-2.3.7/src/kernel/qimage.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 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 456 +++ qt-2.3.7/src/kernel/qimage.cpp2004-04-24 17:12:59.000000000 +0200
457@@ -2201,7 +2201,7 @@ 457@@ -2201,7 +2201,7 @@
458 t2 = srcHeight * dstWidth; 458 t2 = srcHeight * dstWidth;
459 459
460 if (((sModeQStr == "ScaleMin") && (t1 > t2)) || 460 if (((sModeQStr == "ScaleMin") && (t1 > t2)) ||
461 - ((sModeQStr == "ScaleMax") && (t2 < t2))) { 461 - ((sModeQStr == "ScaleMax") && (t2 < t2))) {
462 + ((sModeQStr == "ScaleMax") && (t1 < t2))) { 462 + ((sModeQStr == "ScaleMax") && (t1 < t2))) {
463 dstHeight = t2 / srcWidth; 463 dstHeight = t2 / srcWidth;
464 } else if (sModeQStr != "ScaleFree") { 464 } else if (sModeQStr != "ScaleFree") {
465 dstWidth = t1 / srcHeight; 465 dstWidth = t1 / srcHeight;
466 --- qt-2.3.7/src/tools/qsortedlist.h~qte237-all2003-07-17 03:20:26.000000000 +0200
467 +++ qt-2.3.7/src/tools/qsortedlist.h2004-04-24 17:13:57.000000000 +0200
468@@ -48,7 +48,7 @@
469 public:
470 QSortedList() {}
471 QSortedList( const QSortedList<type> &l ) : QList<type>(l) {}
472- ~QSortedList() { clear(); }
473+ ~QSortedList() { this->clear(); }
474 QSortedList<type> &operator=(const QSortedList<type> &l)
475 { return (QSortedList<type>&)QList<type>::operator=(l); }
476