summaryrefslogtreecommitdiff
Unidiff
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
@@ -5,5 +5,5 @@
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 **
@@ -89,5 +89,5 @@
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;
@@ -146,5 +146,5 @@
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 */
@@ -160,5 +160,5 @@
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 **
@@ -185,5 +185,5 @@
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;
@@ -216,5 +216,5 @@
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);
@@ -227,5 +227,5 @@
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 {
@@ -256,5 +256,5 @@
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 )
@@ -267,5 +267,5 @@
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;
@@ -282,5 +282,5 @@
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
@@ -311,5 +311,5 @@
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
@@ -322,5 +322,5 @@
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=
@@ -333,5 +333,5 @@
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=
@@ -344,5 +344,5 @@
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=
@@ -355,5 +355,5 @@
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=
@@ -366,5 +366,5 @@
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=
@@ -377,5 +377,5 @@
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=
@@ -388,5 +388,5 @@
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=
@@ -399,5 +399,5 @@
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=
@@ -410,5 +410,5 @@
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=
@@ -421,5 +421,5 @@
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=
@@ -432,5 +432,5 @@
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=
@@ -443,5 +443,5 @@
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=
@@ -454,5 +454,5 @@
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;
@@ -464,2 +464,13 @@
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