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
@@ -6,3 +6,3 @@
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 @@
@@ -90,3 +90,3 @@
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 @@
@@ -147,3 +147,3 @@
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 @@
@@ -161,3 +161,3 @@
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 @@
@@ -186,3 +186,3 @@
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 @@
@@ -217,3 +217,3 @@
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 @@
@@ -228,3 +228,3 @@
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 @@
@@ -257,3 +257,3 @@
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 @@
@@ -268,3 +268,3 @@
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 @@
@@ -283,3 +283,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 @@
@@ -312,3 +312,3 @@
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 @@
@@ -323,3 +323,3 @@
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 @@
@@ -334,3 +334,3 @@
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 @@
@@ -345,3 +345,3 @@
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 @@
@@ -356,3 +356,3 @@
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 @@
@@ -367,3 +367,3 @@
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 @@
@@ -378,3 +378,3 @@
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 @@
@@ -389,3 +389,3 @@
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 @@
@@ -400,3 +400,3 @@
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 @@
@@ -411,3 +411,3 @@
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 @@
@@ -422,3 +422,3 @@
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 @@
@@ -433,3 +433,3 @@
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 @@
@@ -444,3 +444,3 @@
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 @@
@@ -455,3 +455,3 @@
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 @@
@@ -465 +465,12 @@
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