summaryrefslogtreecommitdiff
path: root/qt/qt-2.3.7.patch/qte237-gcc34.patch
Unidiff
Diffstat (limited to 'qt/qt-2.3.7.patch/qte237-gcc34.patch') (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qt-2.3.7.patch/qte237-gcc34.patch21
1 files changed, 0 insertions, 21 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-gcc34.patch b/qt/qt-2.3.7.patch/qte237-gcc34.patch
index 5abdd7f..856028d 100644
--- a/qt/qt-2.3.7.patch/qte237-gcc34.patch
+++ b/qt/qt-2.3.7.patch/qte237-gcc34.patch
@@ -42,27 +42,6 @@ diff -ur qt-2.3.7_clean/include/qsortedlist.h qt-2.3.7/include/qsortedlist.h
42 QSortedList<type> &operator=(const QSortedList<type> &l) 42 QSortedList<type> &operator=(const QSortedList<type> &l)
43 { return (QSortedList<type>&)QList<type>::operator=(l); } 43 { return (QSortedList<type>&)QList<type>::operator=(l); }
44 44
45diff -ur qt-2.3.7_clean/include/qstring.h qt-2.3.7/include/qstring.h
46 --- qt-2.3.7_clean/include/qstring.h2004-06-04 02:17:53.000000000 +0200
47 +++ qt-2.3.7/include/qstring.h2004-06-04 02:54:16.000000000 +0200
48@@ -163,8 +163,16 @@
49 bool isLetterOrNumber() const;
50 bool isDigit() const;
51
52+
53+#ifdef Q_NO_PACKED_REFERENCE
54+ uchar& cell() { return *(&cl); }
55+ uchar& row() { return *(&rw); }
56+#else
57 uchar& cell() { return cl; }
58- uchar& row() { return rw; }
59+ uchar& row() { return rw; }
60+#endif
61+
62+
63 uchar cell() const { return cl; }
64 uchar row() const { return rw; }
65
66diff -ur qt-2.3.7_clean/src/kernel/qgfxtransformed_qws.cpp qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp 45diff -ur qt-2.3.7_clean/src/kernel/qgfxtransformed_qws.cpp qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp
67 --- qt-2.3.7_clean/src/kernel/qgfxtransformed_qws.cpp2004-06-04 02:17:53.000000000 +0200 46 --- qt-2.3.7_clean/src/kernel/qgfxtransformed_qws.cpp2004-06-04 02:17:53.000000000 +0200
68 +++ qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp2004-06-04 02:24:25.000000000 +0200 47 +++ qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp2004-06-04 02:24:25.000000000 +0200