author | mickeyl <mickeyl> | 2004-04-24 15:14:30 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-24 15:14:30 (UTC) |
commit | f870c0ba65ce95e1a010de95a4fb961b0c812850 (patch) (side-by-side diff) | |
tree | 884c7ec4318e21da03c6d787e6074155c94e931c /qt | |
parent | 1a00a2edf5da1aa7d47c736bb718933f1c2e774b (diff) | |
download | opie-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())
-rw-r--r-- | qt/qt-2.3.7.patch/qte237-all.patch | 59 |
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 @@ --- qt-2.3.7/src/kernel/qapplication.cpp~qte237-all 2003-07-17 03:20:25.000000000 +0200 -+++ qt-2.3.7/src/kernel/qapplication.cpp 2004-04-15 21:06:51.232857014 +0200 ++++ qt-2.3.7/src/kernel/qapplication.cpp 2004-04-24 17:12:59.000000000 +0200 @@ -35,6 +35,8 @@ @@ -90,3 +90,3 @@ --- qt-2.3.7/src/kernel/qapplication.h~qte237-all 2003-07-17 03:20:25.000000000 +0200 -+++ qt-2.3.7/src/kernel/qapplication.h 2004-04-15 21:06:51.232857014 +0200 ++++ qt-2.3.7/src/kernel/qapplication.h 2004-04-24 17:12:59.000000000 +0200 @@ -61,6 +61,10 @@ @@ -147,3 +147,3 @@ --- qt-2.3.7/src/kernel/qapplication_qws.cpp~qte237-all 2003-07-17 03:20:25.000000000 +0200 -+++ qt-2.3.7/src/kernel/qapplication_qws.cpp 2004-04-15 21:06:51.234856703 +0200 ++++ qt-2.3.7/src/kernel/qapplication_qws.cpp 2004-04-24 17:12:59.000000000 +0200 @@ -2804,6 +2804,11 @@ @@ -161,3 +161,3 @@ --- qt-2.3.7/src/kernel/qfontdatabase.cpp~qte237-all 2003-07-17 03:20:25.000000000 +0200 -+++ qt-2.3.7/src/kernel/qfontdatabase.cpp 2004-04-15 21:06:51.235856547 +0200 ++++ qt-2.3.7/src/kernel/qfontdatabase.cpp 2004-04-24 17:12:59.000000000 +0200 @@ -35,6 +35,8 @@ @@ -186,3 +186,3 @@ --- qt-2.3.7/src/kernel/qfontdatabase.h~qte237-all 2003-07-17 03:20:25.000000000 +0200 -+++ qt-2.3.7/src/kernel/qfontdatabase.h 2004-04-15 21:06:51.236856392 +0200 ++++ qt-2.3.7/src/kernel/qfontdatabase.h 2004-04-24 17:12:59.000000000 +0200 @@ -59,6 +59,10 @@ @@ -217,3 +217,3 @@ --- qt-2.3.7/src/kernel/qgfxraster_qws.cpp~qte237-all 2003-07-17 03:20:25.000000000 +0200 -+++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp 2004-04-15 21:06:51.238856081 +0200 ++++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp 2004-04-24 17:12:59.000000000 +0200 @@ -4237,7 +4237,7 @@ @@ -228,3 +228,3 @@ --- qt-2.3.7/src/kernel/qwindowsystem_qws.cpp~qte237-all 2003-07-17 03:20:26.000000000 +0200 -+++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp 2004-04-15 21:06:51.240855770 +0200 ++++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp 2004-04-24 17:12:59.000000000 +0200 @@ -844,6 +844,18 @@ @@ -257,3 +257,3 @@ --- qt-2.3.7/src/widgets/qcommonstyle.cpp~qte237-all 2003-07-17 03:20:26.000000000 +0200 -+++ qt-2.3.7/src/widgets/qcommonstyle.cpp 2004-04-15 21:06:51.240855770 +0200 ++++ qt-2.3.7/src/widgets/qcommonstyle.cpp 2004-04-24 17:12:59.000000000 +0200 @@ -566,7 +566,7 @@ @@ -268,3 +268,3 @@ --- qt-2.3.7/src/widgets/qlistview.cpp~qte237-all 2003-07-17 03:20:26.000000000 +0200 -+++ qt-2.3.7/src/widgets/qlistview.cpp 2004-04-15 21:06:51.243855303 +0200 ++++ qt-2.3.7/src/widgets/qlistview.cpp 2004-04-24 17:12:59.000000000 +0200 @@ -4968,9 +4968,9 @@ @@ -283,3 +283,3 @@ --- qt-2.3.7/src/widgets/qtoolbutton.cpp~qte237-all 2003-07-17 03:20:27.000000000 +0200 -+++ qt-2.3.7/src/widgets/qtoolbutton.cpp 2004-04-15 21:06:51.243855303 +0200 ++++ qt-2.3.7/src/widgets/qtoolbutton.cpp 2004-04-24 17:12:59.000000000 +0200 @@ -230,7 +230,7 @@ @@ -312,3 +312,3 @@ --- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~qte237-all 2003-07-17 03:20:25.000000000 +0200 -+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp 2004-04-15 21:06:51.244855148 +0200 ++++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp 2004-04-24 17:12:59.000000000 +0200 @@ -238,7 +238,7 @@ @@ -323,3 +323,3 @@ --- qt-2.3.7/configs/linux-generic-g++-shared~qte237-all 2003-07-17 03:23:08.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic-g++-shared 2004-04-15 21:06:51.244855148 +0200 ++++ qt-2.3.7/configs/linux-generic-g++-shared 2004-04-24 17:12:59.000000000 +0200 @@ -36,7 +36,7 @@ @@ -334,3 +334,3 @@ --- qt-2.3.7/configs/linux-generic-g++-shared-debug~qte237-all 2003-07-17 03:23:08.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic-g++-shared-debug 2004-04-15 21:06:51.244855148 +0200 ++++ qt-2.3.7/configs/linux-generic-g++-shared-debug 2004-04-24 17:12:59.000000000 +0200 @@ -36,7 +36,7 @@ @@ -345,3 +345,3 @@ --- qt-2.3.7/configs/linux-generic-g++-static~qte237-all 2003-07-17 03:23:08.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic-g++-static 2004-04-15 21:06:51.244855148 +0200 ++++ qt-2.3.7/configs/linux-generic-g++-static 2004-04-24 17:12:59.000000000 +0200 @@ -36,7 +36,7 @@ @@ -356,3 +356,3 @@ --- qt-2.3.7/configs/linux-generic-g++-static-debug~qte237-all 2003-07-17 03:23:08.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic-g++-static-debug 2004-04-15 21:06:51.245854992 +0200 ++++ qt-2.3.7/configs/linux-generic-g++-static-debug 2004-04-24 17:12:59.000000000 +0200 @@ -36,7 +36,7 @@ @@ -367,3 +367,3 @@ --- qt-2.3.7/configs/linux-generic_rtti-g++-shared~qte237-all 2003-07-17 03:23:08.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic_rtti-g++-shared 2004-04-15 21:06:51.245854992 +0200 ++++ qt-2.3.7/configs/linux-generic_rtti-g++-shared 2004-04-24 17:12:59.000000000 +0200 @@ -36,7 +36,7 @@ @@ -378,3 +378,3 @@ --- qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug~qte237-all 2003-07-17 03:23:08.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug 2004-04-15 21:06:51.245854992 +0200 ++++ qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug 2004-04-24 17:12:59.000000000 +0200 @@ -36,7 +36,7 @@ @@ -389,3 +389,3 @@ --- qt-2.3.7/configs/linux-generic_rtti-g++-static~qte237-all 2003-07-17 03:23:08.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic_rtti-g++-static 2004-04-15 21:06:51.245854992 +0200 ++++ qt-2.3.7/configs/linux-generic_rtti-g++-static 2004-04-24 17:12:59.000000000 +0200 @@ -36,7 +36,7 @@ @@ -400,3 +400,3 @@ --- qt-2.3.7/configs/linux-generic_rtti-g++-static-debug~qte237-all 2003-07-17 03:23:08.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic_rtti-g++-static-debug 2004-04-15 21:06:51.245854992 +0200 ++++ qt-2.3.7/configs/linux-generic_rtti-g++-static-debug 2004-04-24 17:12:59.000000000 +0200 @@ -36,7 +36,7 @@ @@ -411,3 +411,3 @@ --- qt-2.3.7/configs/linux-x86rtti-g++-shared~qte237-all 2003-07-17 03:23:10.000000000 +0200 -+++ qt-2.3.7/configs/linux-x86rtti-g++-shared 2004-04-15 21:06:51.245854992 +0200 ++++ qt-2.3.7/configs/linux-x86rtti-g++-shared 2004-04-24 17:12:59.000000000 +0200 @@ -36,7 +36,7 @@ @@ -422,3 +422,3 @@ --- qt-2.3.7/configs/linux-x86rtti-g++-shared-debug~qte237-all 2003-07-17 03:23:10.000000000 +0200 -+++ qt-2.3.7/configs/linux-x86rtti-g++-shared-debug 2004-04-15 21:06:51.245854992 +0200 ++++ qt-2.3.7/configs/linux-x86rtti-g++-shared-debug 2004-04-24 17:12:59.000000000 +0200 @@ -36,7 +36,7 @@ @@ -433,3 +433,3 @@ --- qt-2.3.7/configs/linux-x86rtti-g++-static~qte237-all 2003-07-17 03:23:10.000000000 +0200 -+++ qt-2.3.7/configs/linux-x86rtti-g++-static 2004-04-15 21:06:51.246854837 +0200 ++++ qt-2.3.7/configs/linux-x86rtti-g++-static 2004-04-24 17:12:59.000000000 +0200 @@ -36,7 +36,7 @@ @@ -444,3 +444,3 @@ --- qt-2.3.7/configs/linux-x86rtti-g++-static-debug~qte237-all 2003-07-17 03:23:10.000000000 +0200 -+++ qt-2.3.7/configs/linux-x86rtti-g++-static-debug 2004-04-15 21:06:51.246854837 +0200 ++++ qt-2.3.7/configs/linux-x86rtti-g++-static-debug 2004-04-24 17:12:59.000000000 +0200 @@ -36,7 +36,7 @@ @@ -455,3 +455,3 @@ --- qt-2.3.7/src/kernel/qimage.cpp~qte237-all 2003-07-17 03:20:25.000000000 +0200 -+++ qt-2.3.7/src/kernel/qimage.cpp 2004-04-15 21:07:23.293869923 +0200 ++++ qt-2.3.7/src/kernel/qimage.cpp 2004-04-24 17:12:59.000000000 +0200 @@ -2201,7 +2201,7 @@ @@ -465 +465,12 @@ dstWidth = t1 / srcHeight; +--- qt-2.3.7/src/tools/qsortedlist.h~qte237-all 2003-07-17 03:20:26.000000000 +0200 ++++ qt-2.3.7/src/tools/qsortedlist.h 2004-04-24 17:13:57.000000000 +0200 +@@ -48,7 +48,7 @@ + public: + QSortedList() {} + QSortedList( const QSortedList<type> &l ) : QList<type>(l) {} +- ~QSortedList() { clear(); } ++ ~QSortedList() { this->clear(); } + QSortedList<type> &operator=(const QSortedList<type> &l) + { return (QSortedList<type>&)QList<type>::operator=(l); } + |