Diffstat (limited to 'qt/qt-2.3.7.patch/qte237-all.patch') (more/less context) (ignore whitespace changes)
-rw-r--r-- | qt/qt-2.3.7.patch/qte237-all.patch | 1261 |
1 files changed, 1075 insertions, 186 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..e3351a3 100644 --- a/qt/qt-2.3.7.patch/qte237-all.patch +++ b/qt/qt-2.3.7.patch/qte237-all.patch | |||
@@ -1,10 +1,463 @@ | |||
1 | 1 | ||
2 | # | ||
3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
4 | # | ||
5 | 2 | ||
6 | --- qt-2.3.7/src/kernel/qapplication.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 | 3 | Included patches: |
7 | +++ qt-2.3.7/src/kernel/qapplication.cpp2004-04-15 21:06:51.232857014 +0200 | 4 | |
5 | qte237-allowoverride.patch | ||
6 | qte237-g++-aslinker.patch | ||
7 | qte237-iconviewspeed.patch | ||
8 | qte237-adjustsizes.patch | ||
9 | qte237-encoding.patch | ||
10 | qte237-keyboard.patch | ||
11 | qte237-gcc34.patch | ||
12 | qte237-lefthand.patch | ||
13 | |||
14 | |||
15 | |||
16 | |||
17 | |||
18 | |||
19 | |||
20 | |||
21 | |||
22 | diff -ur qt-2.3.7-old/configs/linux-generic-g++-shared qt-2.3.7/configs/linux-generic-g++-shared | ||
23 | --- qt-2.3.7-old/configs/linux-generic-g++-shared2004-07-23 15:22:56.000000000 +0200 | ||
24 | +++ qt-2.3.7/configs/linux-generic-g++-shared2004-07-23 15:23:12.000000000 +0200 | ||
25 | @@ -36,7 +36,7 @@ | ||
26 | SYSCONF_LIBS_YACC= | ||
27 | |||
28 | # Linking applications | ||
29 | -SYSCONF_LINK = gcc | ||
30 | +SYSCONF_LINK = g++ | ||
31 | SYSCONF_LFLAGS = | ||
32 | SYSCONF_LIBS = | ||
33 | |||
34 | diff -ur qt-2.3.7-old/configs/linux-generic-g++-shared-debug qt-2.3.7/configs/linux-generic-g++-shared-debug | ||
35 | --- qt-2.3.7-old/configs/linux-generic-g++-shared-debug2004-07-23 15:22:56.000000000 +0200 | ||
36 | +++ qt-2.3.7/configs/linux-generic-g++-shared-debug2004-07-23 15:23:12.000000000 +0200 | ||
37 | @@ -36,7 +36,7 @@ | ||
38 | SYSCONF_LIBS_YACC= | ||
39 | |||
40 | # Linking applications | ||
41 | -SYSCONF_LINK = gcc | ||
42 | +SYSCONF_LINK = g++ | ||
43 | SYSCONF_LFLAGS = | ||
44 | SYSCONF_LIBS = | ||
45 | |||
46 | diff -ur qt-2.3.7-old/configs/linux-generic-g++-static qt-2.3.7/configs/linux-generic-g++-static | ||
47 | --- qt-2.3.7-old/configs/linux-generic-g++-static2004-07-23 15:22:56.000000000 +0200 | ||
48 | +++ qt-2.3.7/configs/linux-generic-g++-static2004-07-23 15:23:12.000000000 +0200 | ||
49 | @@ -36,7 +36,7 @@ | ||
50 | SYSCONF_LIBS_YACC= | ||
51 | |||
52 | # Linking applications | ||
53 | -SYSCONF_LINK = gcc | ||
54 | +SYSCONF_LINK = g++ | ||
55 | SYSCONF_LFLAGS = | ||
56 | SYSCONF_LIBS = | ||
57 | |||
58 | diff -ur qt-2.3.7-old/configs/linux-generic-g++-static-debug qt-2.3.7/configs/linux-generic-g++-static-debug | ||
59 | --- qt-2.3.7-old/configs/linux-generic-g++-static-debug2004-07-23 15:22:56.000000000 +0200 | ||
60 | +++ qt-2.3.7/configs/linux-generic-g++-static-debug2004-07-23 15:23:12.000000000 +0200 | ||
61 | @@ -36,7 +36,7 @@ | ||
62 | SYSCONF_LIBS_YACC= | ||
63 | |||
64 | # Linking applications | ||
65 | -SYSCONF_LINK = gcc | ||
66 | +SYSCONF_LINK = g++ | ||
67 | SYSCONF_LFLAGS = | ||
68 | SYSCONF_LIBS = | ||
69 | |||
70 | diff -ur qt-2.3.7-old/configs/linux-generic_rtti-g++-shared qt-2.3.7/configs/linux-generic_rtti-g++-shared | ||
71 | --- qt-2.3.7-old/configs/linux-generic_rtti-g++-shared2004-07-23 15:22:56.000000000 +0200 | ||
72 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-shared2004-07-23 15:23:12.000000000 +0200 | ||
73 | @@ -36,7 +36,7 @@ | ||
74 | SYSCONF_LIBS_YACC= | ||
75 | |||
76 | # Linking applications | ||
77 | -SYSCONF_LINK = gcc | ||
78 | +SYSCONF_LINK = g++ | ||
79 | SYSCONF_LFLAGS = | ||
80 | SYSCONF_LIBS = | ||
81 | |||
82 | diff -ur qt-2.3.7-old/configs/linux-generic_rtti-g++-shared-debug qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug | ||
83 | --- qt-2.3.7-old/configs/linux-generic_rtti-g++-shared-debug2004-07-23 15:22:56.000000000 +0200 | ||
84 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug2004-07-23 15:23:12.000000000 +0200 | ||
85 | @@ -36,7 +36,7 @@ | ||
86 | SYSCONF_LIBS_YACC= | ||
87 | |||
88 | # Linking applications | ||
89 | -SYSCONF_LINK = gcc | ||
90 | +SYSCONF_LINK = g++ | ||
91 | SYSCONF_LFLAGS = | ||
92 | SYSCONF_LIBS = | ||
93 | |||
94 | diff -ur qt-2.3.7-old/configs/linux-generic_rtti-g++-static qt-2.3.7/configs/linux-generic_rtti-g++-static | ||
95 | --- qt-2.3.7-old/configs/linux-generic_rtti-g++-static2004-07-23 15:22:56.000000000 +0200 | ||
96 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-static2004-07-23 15:23:12.000000000 +0200 | ||
97 | @@ -36,7 +36,7 @@ | ||
98 | SYSCONF_LIBS_YACC= | ||
99 | |||
100 | # Linking applications | ||
101 | -SYSCONF_LINK = gcc | ||
102 | +SYSCONF_LINK = g++ | ||
103 | SYSCONF_LFLAGS = | ||
104 | SYSCONF_LIBS = | ||
105 | |||
106 | diff -ur qt-2.3.7-old/configs/linux-generic_rtti-g++-static-debug qt-2.3.7/configs/linux-generic_rtti-g++-static-debug | ||
107 | --- qt-2.3.7-old/configs/linux-generic_rtti-g++-static-debug2004-07-23 15:22:56.000000000 +0200 | ||
108 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-static-debug2004-07-23 15:23:12.000000000 +0200 | ||
109 | @@ -36,7 +36,7 @@ | ||
110 | SYSCONF_LIBS_YACC= | ||
111 | |||
112 | # Linking applications | ||
113 | -SYSCONF_LINK = gcc | ||
114 | +SYSCONF_LINK = g++ | ||
115 | SYSCONF_LFLAGS = | ||
116 | SYSCONF_LIBS = | ||
117 | |||
118 | diff -ur qt-2.3.7-old/configs/linux-x86rtti-g++-shared qt-2.3.7/configs/linux-x86rtti-g++-shared | ||
119 | --- qt-2.3.7-old/configs/linux-x86rtti-g++-shared2004-07-23 15:22:56.000000000 +0200 | ||
120 | +++ qt-2.3.7/configs/linux-x86rtti-g++-shared2004-07-23 15:23:12.000000000 +0200 | ||
121 | @@ -36,7 +36,7 @@ | ||
122 | SYSCONF_LIBS_YACC= | ||
123 | |||
124 | # Linking applications | ||
125 | -SYSCONF_LINK = gcc | ||
126 | +SYSCONF_LINK = g++ | ||
127 | SYSCONF_LFLAGS = | ||
128 | SYSCONF_LIBS = -lm | ||
129 | |||
130 | diff -ur qt-2.3.7-old/configs/linux-x86rtti-g++-shared-debug qt-2.3.7/configs/linux-x86rtti-g++-shared-debug | ||
131 | --- qt-2.3.7-old/configs/linux-x86rtti-g++-shared-debug2004-07-23 15:22:56.000000000 +0200 | ||
132 | +++ qt-2.3.7/configs/linux-x86rtti-g++-shared-debug2004-07-23 15:23:12.000000000 +0200 | ||
133 | @@ -36,7 +36,7 @@ | ||
134 | SYSCONF_LIBS_YACC= | ||
135 | |||
136 | # Linking applications | ||
137 | -SYSCONF_LINK = gcc | ||
138 | +SYSCONF_LINK = g++ | ||
139 | SYSCONF_LFLAGS = | ||
140 | SYSCONF_LIBS = -lm | ||
141 | |||
142 | diff -ur qt-2.3.7-old/configs/linux-x86rtti-g++-static qt-2.3.7/configs/linux-x86rtti-g++-static | ||
143 | --- qt-2.3.7-old/configs/linux-x86rtti-g++-static2004-07-23 15:22:56.000000000 +0200 | ||
144 | +++ qt-2.3.7/configs/linux-x86rtti-g++-static2004-07-23 15:23:12.000000000 +0200 | ||
145 | @@ -36,7 +36,7 @@ | ||
146 | SYSCONF_LIBS_YACC= | ||
147 | |||
148 | # Linking applications | ||
149 | -SYSCONF_LINK = gcc | ||
150 | +SYSCONF_LINK = g++ | ||
151 | SYSCONF_LFLAGS = | ||
152 | SYSCONF_LIBS = -lm | ||
153 | |||
154 | diff -ur qt-2.3.7-old/configs/linux-x86rtti-g++-static-debug qt-2.3.7/configs/linux-x86rtti-g++-static-debug | ||
155 | --- qt-2.3.7-old/configs/linux-x86rtti-g++-static-debug2004-07-23 15:22:56.000000000 +0200 | ||
156 | +++ qt-2.3.7/configs/linux-x86rtti-g++-static-debug2004-07-23 15:23:12.000000000 +0200 | ||
157 | @@ -36,7 +36,7 @@ | ||
158 | SYSCONF_LIBS_YACC= | ||
159 | |||
160 | # Linking applications | ||
161 | -SYSCONF_LINK = gcc | ||
162 | +SYSCONF_LINK = g++ | ||
163 | SYSCONF_LFLAGS = | ||
164 | SYSCONF_LIBS = -lm | ||
165 | |||
166 | diff -ur qt-2.3.7-old/include/qapplication.h qt-2.3.7/include/qapplication.h | ||
167 | --- qt-2.3.7-old/include/qapplication.h2004-07-23 15:22:56.000000000 +0200 | ||
168 | +++ qt-2.3.7/include/qapplication.h2004-07-23 15:25:42.000000000 +0200 | ||
169 | @@ -61,6 +61,10 @@ | ||
170 | class QSemaphore; | ||
171 | #endif | ||
172 | |||
173 | +#if !defined( QT_WEAK_SYMBOL ) | ||
174 | +#define QT_WEAK_SYMBOL | ||
175 | +#endif | ||
176 | + | ||
177 | // REMOVE IN 3.0 (just here for moc source compatibility) | ||
178 | #define QNonBaseApplication QApplication | ||
179 | |||
180 | @@ -85,7 +89,10 @@ | ||
181 | |||
182 | #ifndef QT_NO_STYLE | ||
183 | static QStyle &style(); | ||
184 | - static void setStyle( QStyle* ); | ||
185 | + static void setStyle( QStyle* ) QT_WEAK_SYMBOL; | ||
186 | +private: | ||
187 | +static void setStyle_NonWeak( QStyle* ); | ||
188 | +public: | ||
189 | #endif | ||
190 | #if 1/* OBSOLETE */ | ||
191 | enum ColorMode { NormalColors, CustomColors }; | ||
192 | @@ -106,11 +113,19 @@ | ||
193 | #ifndef QT_NO_PALETTE | ||
194 | static QPalette palette( const QWidget* = 0 ); | ||
195 | static void setPalette( const QPalette &, bool informWidgets=FALSE, | ||
196 | + const char* className = 0 ) QT_WEAK_SYMBOL; | ||
197 | +private: | ||
198 | + static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE, | ||
199 | const char* className = 0 ); | ||
200 | +public: | ||
201 | #endif | ||
202 | static QFont font( const QWidget* = 0 ); | ||
203 | static void setFont( const QFont &, bool informWidgets=FALSE, | ||
204 | + const char* className = 0 ) QT_WEAK_SYMBOL; | ||
205 | +private: | ||
206 | + static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE, | ||
207 | const char* className = 0 ); | ||
208 | +public: | ||
209 | static QFontMetrics fontMetrics(); | ||
210 | |||
211 | QWidget *mainWidget() const; | ||
212 | @@ -207,7 +222,10 @@ | ||
213 | void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); | ||
214 | #ifndef QT_NO_QWS_MANAGER | ||
215 | static QWSDecoration &qwsDecoration(); | ||
216 | - static void qwsSetDecoration( QWSDecoration *); | ||
217 | + static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; | ||
218 | +private: | ||
219 | + static void qwsSetDecoration_NonWeak( QWSDecoration *); | ||
220 | +public: | ||
221 | #endif | ||
222 | #endif | ||
223 | |||
224 | diff -ur qt-2.3.7-old/include/qcstring.h qt-2.3.7/include/qcstring.h | ||
225 | --- qt-2.3.7-old/include/qcstring.h2004-07-23 15:22:56.000000000 +0200 | ||
226 | +++ qt-2.3.7/include/qcstring.h2004-07-23 15:42:01.000000000 +0200 | ||
227 | @@ -119,7 +119,7 @@ | ||
228 | // We want to keep source compatibility for 2.x | ||
229 | // ### TODO for 4.0: completely remove these and the cstr* functions | ||
230 | |||
231 | -#if !defined(QT_GENUINE_STR) | ||
232 | +#if 0 | ||
233 | |||
234 | #undefstrlen | ||
235 | #define strlen qstrlen | ||
236 | diff -ur qt-2.3.7-old/include/qfontdatabase.h qt-2.3.7/include/qfontdatabase.h | ||
237 | --- qt-2.3.7-old/include/qfontdatabase.h2004-07-23 15:22:56.000000000 +0200 | ||
238 | +++ qt-2.3.7/include/qfontdatabase.h2004-07-23 15:25:42.000000000 +0200 | ||
239 | @@ -59,6 +59,10 @@ | ||
240 | class QDiskFont; | ||
241 | #endif | ||
242 | |||
243 | +#if !defined( QT_WEAK_SYMBOL ) | ||
244 | +#define QT_WEAK_SYMBOL | ||
245 | +#endif | ||
246 | + | ||
247 | class QFontDatabasePrivate; | ||
248 | |||
249 | class Q_EXPORT QFontDatabase | ||
250 | @@ -67,9 +71,16 @@ | ||
251 | QFontDatabase(); | ||
252 | |||
253 | QStringList families( bool onlyForLocale = TRUE ) const; | ||
254 | + | ||
255 | + | ||
256 | QValueList<int> pointSizes( const QString &family, | ||
257 | const QString &style = QString::null, | ||
258 | - const QString &charSet = QString::null ); | ||
259 | + const QString &charSet = QString::null ) QT_WEAK_SYMBOL; | ||
260 | +private: | ||
261 | + QValueList<int> pointSizes_NonWeak( const QString &family, | ||
262 | + const QString &style, | ||
263 | + const QString &charSet ); | ||
264 | +public: | ||
265 | QStringList styles( const QString &family, | ||
266 | const QString &charSet = QString::null ) const; | ||
267 | QStringList charSets( const QString &familyName, | ||
268 | diff -ur qt-2.3.7-old/include/qglobal.h qt-2.3.7/include/qglobal.h | ||
269 | --- qt-2.3.7-old/include/qglobal.h2004-07-23 15:22:56.000000000 +0200 | ||
270 | +++ qt-2.3.7/include/qglobal.h2004-07-23 15:42:01.000000000 +0200 | ||
271 | @@ -207,8 +207,16 @@ | ||
272 | #if __GNUC__ == 2 && __GNUC_MINOR__ == 96 | ||
273 | #define Q_FP_CCAST_BROKEN | ||
274 | #endif | ||
275 | +/* ARM gcc pads structs to 32 bits, even when they contain a single | ||
276 | + char, or short. We tell gcc to pack QChars to 16 bits, to avoid | ||
277 | + QString bloat. However, gcc 3.4 doesn't allow us to create references to | ||
278 | + members of a packed struct. (Pointers are OK, because then you | ||
279 | + supposedly know what you are doing.) */ | ||
280 | #if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) | ||
281 | #define Q_PACKED __attribute__ ((packed)) | ||
282 | +# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 | ||
283 | +# define Q_NO_PACKED_REFERENCE | ||
284 | +# endif | ||
285 | #endif | ||
286 | #elif defined(__xlC__) | ||
287 | #define _CC_XLC_ | ||
288 | diff -ur qt-2.3.7-old/include/qiconview.h qt-2.3.7/include/qiconview.h | ||
289 | --- qt-2.3.7-old/include/qiconview.h2004-07-23 15:22:56.000000000 +0200 | ||
290 | +++ qt-2.3.7/include/qiconview.h2004-07-23 15:45:34.000000000 +0200 | ||
291 | @@ -444,6 +444,7 @@ | ||
292 | virtual void contentsDropEvent( QDropEvent *e ); | ||
293 | #endif | ||
294 | |||
295 | + void bufferedPaintEvent( QPaintEvent* ); | ||
296 | virtual void resizeEvent( QResizeEvent* e ); | ||
297 | virtual void keyPressEvent( QKeyEvent *e ); | ||
298 | virtual void focusInEvent( QFocusEvent *e ); | ||
299 | diff -ur qt-2.3.7-old/include/qsortedlist.h qt-2.3.7/include/qsortedlist.h | ||
300 | --- qt-2.3.7-old/include/qsortedlist.h2004-07-23 15:22:56.000000000 +0200 | ||
301 | +++ qt-2.3.7/include/qsortedlist.h2004-07-23 15:42:01.000000000 +0200 | ||
302 | @@ -48,7 +48,7 @@ | ||
303 | public: | ||
304 | QSortedList() {} | ||
305 | QSortedList( const QSortedList<type> &l ) : QList<type>(l) {} | ||
306 | - ~QSortedList() { clear(); } | ||
307 | + ~QSortedList() { this->clear(); } | ||
308 | QSortedList<type> &operator=(const QSortedList<type> &l) | ||
309 | { return (QSortedList<type>&)QList<type>::operator=(l); } | ||
310 | |||
311 | diff -ur qt-2.3.7-old/include/qstring.h qt-2.3.7/include/qstring.h | ||
312 | --- qt-2.3.7-old/include/qstring.h2004-07-23 15:22:56.000000000 +0200 | ||
313 | +++ qt-2.3.7/include/qstring.h2004-07-23 15:42:01.000000000 +0200 | ||
314 | @@ -163,8 +163,16 @@ | ||
315 | bool isLetterOrNumber() const; | ||
316 | bool isDigit() const; | ||
317 | |||
318 | + | ||
319 | +#ifdef Q_NO_PACKED_REFERENCE | ||
320 | + uchar& cell() { return *(&cl); } | ||
321 | + uchar& row() { return *(&rw); } | ||
322 | +#else | ||
323 | uchar& cell() { return cl; } | ||
324 | - uchar& row() { return rw; } | ||
325 | + uchar& row() { return rw; } | ||
326 | +#endif | ||
327 | + | ||
328 | + | ||
329 | uchar cell() const { return cl; } | ||
330 | uchar row() const { return rw; } | ||
331 | |||
332 | diff -ur qt-2.3.7-old/src/iconview/qiconview.cpp qt-2.3.7/src/iconview/qiconview.cpp | ||
333 | --- qt-2.3.7-old/src/iconview/qiconview.cpp2004-07-23 15:22:56.000000000 +0200 | ||
334 | +++ qt-2.3.7/src/iconview/qiconview.cpp2004-07-23 15:45:34.000000000 +0200 | ||
335 | @@ -1,5 +1,5 @@ | ||
336 | /**************************************************************************** | ||
337 | -** $Id$ | ||
338 | +** $Id$ | ||
339 | ** | ||
340 | ** Implementation of QIconView widget class | ||
341 | ** | ||
342 | @@ -220,6 +220,7 @@ | ||
343 | QIconView::SelectionMode selectionMode; | ||
344 | QIconViewItem *currentItem, *tmpCurrentItem, *highlightedItem, *startDragItem, *pressedItem, *selectAnchor; | ||
345 | QRect *rubber; | ||
346 | + QPixmap *backBuffer; | ||
347 | QTimer *scrollTimer, *adjustTimer, *updateTimer, *inputTimer, | ||
348 | *fullRedrawTimer; | ||
349 | int rastX, rastY, spacing; | ||
350 | @@ -2263,6 +2264,7 @@ | ||
351 | d->currentItem = 0; | ||
352 | d->highlightedItem = 0; | ||
353 | d->rubber = 0; | ||
354 | + d->backBuffer = 0; | ||
355 | d->scrollTimer = 0; | ||
356 | d->startDragItem = 0; | ||
357 | d->tmpCurrentItem = 0; | ||
358 | @@ -2411,6 +2413,8 @@ | ||
359 | delete item; | ||
360 | item = tmp; | ||
361 | } | ||
362 | + delete d->backBuffer; | ||
363 | + d->backBuffer = 0; | ||
364 | delete d->fm; | ||
365 | d->fm = 0; | ||
366 | #ifndef QT_NO_TOOLTIP | ||
367 | @@ -2877,6 +2881,48 @@ | ||
368 | } | ||
369 | |||
370 | /*! | ||
371 | + This function grabs all paintevents that otherwise would have been | ||
372 | + processed by the QScrollView::viewportPaintEvent(). Here we use a | ||
373 | + doublebuffer to reduce 'on-paint' flickering on QIconView | ||
374 | + (and of course its childs). | ||
375 | + | ||
376 | + \sa QScrollView::viewportPaintEvent(), QIconView::drawContents() | ||
377 | +*/ | ||
378 | + | ||
379 | +void QIconView::bufferedPaintEvent( QPaintEvent* pe ) | ||
380 | +{ | ||
381 | + QWidget* vp = viewport(); | ||
382 | + QRect r = pe->rect() & vp->rect(); | ||
383 | + int ex = r.x() + contentsX(); | ||
384 | + int ey = r.y() + contentsY(); | ||
385 | + int ew = r.width(); | ||
386 | + int eh = r.height(); | ||
387 | + | ||
388 | + if ( !d->backBuffer ) | ||
389 | +d->backBuffer = new QPixmap(vp->size()); | ||
390 | + if ( d->backBuffer->size() != vp->size() ) { | ||
391 | +//Resize function (with hysteesis). Uses a good compromise between memory | ||
392 | +//consumption and speed (number) of resizes. | ||
393 | + float newWidth = (float)vp->width(); | ||
394 | +float newHeight = (float)vp->height(); | ||
395 | +if ( newWidth > d->backBuffer->width() || newHeight > d->backBuffer->height() ) | ||
396 | +{ | ||
397 | + newWidth *= 1.1892; | ||
398 | + newHeight *= 1.1892; | ||
399 | + d->backBuffer->resize( (int)newWidth, (int)newHeight ); | ||
400 | +} else if ( 1.5*newWidth < d->backBuffer->width() || 1.5*newHeight < d->backBuffer->height() ) | ||
401 | + d->backBuffer->resize( (int)newWidth, (int)newHeight ); | ||
402 | + } | ||
403 | + | ||
404 | + QPainter p; | ||
405 | + p.begin(d->backBuffer, vp); | ||
406 | + drawContentsOffset(&p, contentsX(), contentsY(), ex, ey, ew, eh); | ||
407 | + p.end(); | ||
408 | + bitBlt(vp, r.x(), r.y(), d->backBuffer, r.x(), r.y(), ew, eh); | ||
409 | +} | ||
410 | + | ||
411 | +/*! | ||
412 | + | ||
413 | \reimp | ||
414 | */ | ||
415 | |||
416 | @@ -4855,7 +4901,7 @@ | ||
417 | if ( !d->rubber ) | ||
418 | drawDragShapes( d->oldDragPos ); | ||
419 | } | ||
420 | - viewportPaintEvent( (QPaintEvent*)e ); | ||
421 | + bufferedPaintEvent ((QPaintEvent*)e ); | ||
422 | if ( d->dragging ) { | ||
423 | if ( !d->rubber ) | ||
424 | drawDragShapes( d->oldDragPos ); | ||
425 | @@ -5286,11 +5332,19 @@ | ||
426 | return; | ||
427 | |||
428 | if ( item->d->container1 && d->firstContainer ) { | ||
429 | -item->d->container1->items.removeRef( item ); | ||
430 | + //Special-case checking of the last item, since this may be | ||
431 | + //called a few times for the same item. | ||
432 | + if (item->d->container1->items.last() == item) | ||
433 | + item->d->container1->items.removeLast(); | ||
434 | + else | ||
435 | + item->d->container1->items.removeRef( item ); | ||
436 | } | ||
437 | item->d->container1 = 0; | ||
438 | if ( item->d->container2 && d->firstContainer ) { | ||
439 | -item->d->container2->items.removeRef( item ); | ||
440 | + if (item->d->container2->items.last() == item) | ||
441 | + item->d->container2->items.removeLast(); | ||
442 | + else | ||
443 | + item->d->container2->items.removeRef( item ); | ||
444 | } | ||
445 | item->d->container2 = 0; | ||
446 | |||
447 | diff -ur qt-2.3.7-old/src/iconview/qiconview.h qt-2.3.7/src/iconview/qiconview.h | ||
448 | --- qt-2.3.7-old/src/iconview/qiconview.h2004-07-23 15:22:56.000000000 +0200 | ||
449 | +++ qt-2.3.7/src/iconview/qiconview.h2004-07-23 15:45:34.000000000 +0200 | ||
450 | @@ -444,6 +444,7 @@ | ||
451 | virtual void contentsDropEvent( QDropEvent *e ); | ||
452 | #endif | ||
453 | |||
454 | + void bufferedPaintEvent( QPaintEvent* ); | ||
455 | virtual void resizeEvent( QResizeEvent* e ); | ||
456 | virtual void keyPressEvent( QKeyEvent *e ); | ||
457 | virtual void focusInEvent( QFocusEvent *e ); | ||
458 | diff -ur qt-2.3.7-old/src/kernel/qapplication.cpp qt-2.3.7/src/kernel/qapplication.cpp | ||
459 | --- qt-2.3.7-old/src/kernel/qapplication.cpp2004-07-23 15:22:56.000000000 +0200 | ||
460 | +++ qt-2.3.7/src/kernel/qapplication.cpp2004-07-23 15:25:42.000000000 +0200 | ||
8 | @@ -35,6 +35,8 @@ | 461 | @@ -35,6 +35,8 @@ |
9 | ** | 462 | ** |
10 | **********************************************************************/ | 463 | **********************************************************************/ |
@@ -87,8 +540,9 @@ | |||
87 | bool all = FALSE; | 540 | bool all = FALSE; |
88 | if ( !className ) { | 541 | if ( !className ) { |
89 | if ( !app_font ) { | 542 | if ( !app_font ) { |
90 | --- qt-2.3.7/src/kernel/qapplication.h~qte237-all2003-07-17 03:20:25.000000000 +0200 | 543 | diff -ur qt-2.3.7-old/src/kernel/qapplication.h qt-2.3.7/src/kernel/qapplication.h |
91 | +++ qt-2.3.7/src/kernel/qapplication.h2004-04-15 21:06:51.232857014 +0200 | 544 | --- qt-2.3.7-old/src/kernel/qapplication.h2004-07-23 15:22:56.000000000 +0200 |
545 | +++ qt-2.3.7/src/kernel/qapplication.h2004-07-23 15:25:42.000000000 +0200 | ||
92 | @@ -61,6 +61,10 @@ | 546 | @@ -61,6 +61,10 @@ |
93 | class QSemaphore; | 547 | class QSemaphore; |
94 | #endif | 548 | #endif |
@@ -144,8 +598,9 @@ | |||
144 | #endif | 598 | #endif |
145 | #endif | 599 | #endif |
146 | 600 | ||
147 | --- qt-2.3.7/src/kernel/qapplication_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 | 601 | diff -ur qt-2.3.7-old/src/kernel/qapplication_qws.cpp qt-2.3.7/src/kernel/qapplication_qws.cpp |
148 | +++ qt-2.3.7/src/kernel/qapplication_qws.cpp2004-04-15 21:06:51.234856703 +0200 | 602 | --- qt-2.3.7-old/src/kernel/qapplication_qws.cpp2004-07-23 15:22:56.000000000 +0200 |
603 | +++ qt-2.3.7/src/kernel/qapplication_qws.cpp2004-07-23 15:25:42.000000000 +0200 | ||
149 | @@ -2804,6 +2804,11 @@ | 604 | @@ -2804,6 +2804,11 @@ |
150 | */ | 605 | */ |
151 | void QApplication::qwsSetDecoration( QWSDecoration *d ) | 606 | void QApplication::qwsSetDecoration( QWSDecoration *d ) |
@@ -158,8 +613,9 @@ | |||
158 | if ( d ) { | 613 | if ( d ) { |
159 | delete qws_decoration; | 614 | delete qws_decoration; |
160 | qws_decoration = d; | 615 | qws_decoration = d; |
161 | --- qt-2.3.7/src/kernel/qfontdatabase.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 | 616 | diff -ur qt-2.3.7-old/src/kernel/qfontdatabase.cpp qt-2.3.7/src/kernel/qfontdatabase.cpp |
162 | +++ qt-2.3.7/src/kernel/qfontdatabase.cpp2004-04-15 21:06:51.235856547 +0200 | 617 | --- qt-2.3.7-old/src/kernel/qfontdatabase.cpp2004-07-23 15:22:56.000000000 +0200 |
618 | +++ qt-2.3.7/src/kernel/qfontdatabase.cpp2004-07-23 15:25:42.000000000 +0200 | ||
163 | @@ -35,6 +35,8 @@ | 619 | @@ -35,6 +35,8 @@ |
164 | ** | 620 | ** |
165 | **********************************************************************/ | 621 | **********************************************************************/ |
@@ -183,8 +639,9 @@ | |||
183 | QString cs( charSet ); | 639 | QString cs( charSet ); |
184 | if ( charSet.isEmpty() ) { | 640 | if ( charSet.isEmpty() ) { |
185 | QStringList lst = charSets( family ); | 641 | QStringList lst = charSets( family ); |
186 | --- qt-2.3.7/src/kernel/qfontdatabase.h~qte237-all2003-07-17 03:20:25.000000000 +0200 | 642 | diff -ur qt-2.3.7-old/src/kernel/qfontdatabase.h qt-2.3.7/src/kernel/qfontdatabase.h |
187 | +++ qt-2.3.7/src/kernel/qfontdatabase.h2004-04-15 21:06:51.236856392 +0200 | 643 | --- qt-2.3.7-old/src/kernel/qfontdatabase.h2004-07-23 15:22:56.000000000 +0200 |
644 | +++ qt-2.3.7/src/kernel/qfontdatabase.h2004-07-23 15:25:42.000000000 +0200 | ||
188 | @@ -59,6 +59,10 @@ | 645 | @@ -59,6 +59,10 @@ |
189 | class QDiskFont; | 646 | class QDiskFont; |
190 | #endif | 647 | #endif |
@@ -214,19 +671,350 @@ | |||
214 | QStringList styles( const QString &family, | 671 | QStringList styles( const QString &family, |
215 | const QString &charSet = QString::null ) const; | 672 | const QString &charSet = QString::null ) const; |
216 | QStringList charSets( const QString &familyName, | 673 | QStringList charSets( const QString &familyName, |
217 | --- qt-2.3.7/src/kernel/qgfxraster_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 | 674 | diff -ur qt-2.3.7-old/src/kernel/qgfxtransformed_qws.cpp qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp |
218 | +++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp2004-04-15 21:06:51.238856081 +0200 | 675 | --- qt-2.3.7-old/src/kernel/qgfxtransformed_qws.cpp2004-07-23 15:22:56.000000000 +0200 |
219 | @@ -4237,7 +4237,7 @@ | 676 | +++ qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp2004-07-23 15:42:01.000000000 +0200 |
220 | setAlphaType(IgnoreAlpha); | 677 | @@ -671,11 +671,11 @@ |
221 | if ( w <= 0 || h <= 0 || !ncliprect ) return; | 678 | inline int tx( int x, int y ) { |
222 | GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1)) | 679 | switch ( qt_trans_screen->transformation() ) { |
223 | -#ifdef QWS_EXPERIMENTAL_FASTPATH | 680 | case QTransformedScreen::Rot90: |
224 | +#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !! | 681 | - return y - xoffs + yoffs; |
225 | // ### fix for 8bpp | 682 | + return y - this->xoffs + this->yoffs; |
226 | // This seems to be reliable now, at least for 16bpp | 683 | case QTransformedScreen::Rot180: |
227 | 684 | - return (width - x - 1) - xoffs - xoffs; | |
228 | --- qt-2.3.7/src/kernel/qwindowsystem_qws.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200 | 685 | + return (this->width - x - 1) - this->xoffs - this->xoffs; |
229 | +++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp2004-04-15 21:06:51.240855770 +0200 | 686 | case QTransformedScreen::Rot270: |
687 | - return (height - y - 1) - xoffs - yoffs; | ||
688 | + return (this->height - y - 1) - this->xoffs - this->yoffs; | ||
689 | default: | ||
690 | return x; | ||
691 | } | ||
692 | @@ -683,11 +683,11 @@ | ||
693 | inline int ty( int x, int y ) { | ||
694 | switch ( qt_trans_screen->transformation() ) { | ||
695 | case QTransformedScreen::Rot90: | ||
696 | - return (width - x - 1) - yoffs - xoffs; | ||
697 | + return (this->width - x - 1) - this->yoffs - this->xoffs; | ||
698 | case QTransformedScreen::Rot180: | ||
699 | - return (height - y - 1) - yoffs - yoffs; | ||
700 | + return (this->height - y - 1) - this->yoffs - this->yoffs; | ||
701 | case QTransformedScreen::Rot270: | ||
702 | - return x - yoffs + xoffs; | ||
703 | + return x - this->yoffs + this->xoffs; | ||
704 | default: | ||
705 | return y; | ||
706 | } | ||
707 | @@ -715,23 +715,23 @@ | ||
708 | template <const int depth, const int type> | ||
709 | void QGfxTransformedRaster<depth,type>::setSourceWidgetOffset(int x, int y) | ||
710 | { | ||
711 | - if ( srcbits == buffer ) { | ||
712 | + if ( this->srcbits == this->buffer ) { | ||
713 | switch ( qt_trans_screen->transformation() ) { | ||
714 | case QTransformedScreen::Rot90: | ||
715 | - srcwidgetoffs = QPoint( y, width - x - srcwidth ); | ||
716 | + this->srcwidgetoffs = QPoint( y, this->width - x - this->srcwidth ); | ||
717 | break; | ||
718 | case QTransformedScreen::Rot180: | ||
719 | - srcwidgetoffs = QPoint( width - x - srcwidth, height - y - srcheight ); | ||
720 | + this->srcwidgetoffs = QPoint( this->width - x - this->srcwidth, this->height - y - this->srcheight ); | ||
721 | break; | ||
722 | case QTransformedScreen::Rot270: | ||
723 | - srcwidgetoffs = QPoint( height - y - srcheight, x ); | ||
724 | + this->srcwidgetoffs = QPoint( this->height - y - this->srcheight, x ); | ||
725 | break; | ||
726 | default: | ||
727 | - srcwidgetoffs = QPoint( x, y ); | ||
728 | + this->srcwidgetoffs = QPoint( x, y ); | ||
729 | break; | ||
730 | } | ||
731 | } else | ||
732 | -srcwidgetoffs = QPoint( x, y ); | ||
733 | +this->srcwidgetoffs = QPoint( x, y ); | ||
734 | } | ||
735 | |||
736 | template <const int depth, const int type> | ||
737 | @@ -739,8 +739,8 @@ | ||
738 | { | ||
739 | QT_TRANS_GFX_BASE<depth,type>::setSource(i); | ||
740 | QSize s = qt_screen->mapToDevice( QSize(i->width(), i->height()) ); | ||
741 | - srcwidth = s.width(); | ||
742 | - srcheight = s.height(); | ||
743 | + this->srcwidth = s.width(); | ||
744 | + this->srcheight = s.height(); | ||
745 | } | ||
746 | |||
747 | template <const int depth, const int type> | ||
748 | @@ -782,7 +782,7 @@ | ||
749 | if ( w == 0 || h == 0 ) | ||
750 | return; | ||
751 | QRect r( x, y, w, h ); | ||
752 | - if ( cbrush.style() == SolidPattern ) { | ||
753 | + if ( this->cbrush.style() == Qt::SolidPattern ) { | ||
754 | r.setCoords( tx(x,y), ty(x,y), tx(x+w-1,y+h-1), ty(x+w-1,y+h-1) ); | ||
755 | r = r.normalize(); | ||
756 | } | ||
757 | @@ -797,7 +797,7 @@ | ||
758 | // solution. The brush offset logic is complicated enough, so we don't | ||
759 | // fastpath patternedbrush. | ||
760 | |||
761 | - if ( inDraw || cpen.style()==NoPen || patternedbrush ) { | ||
762 | + if ( inDraw || this->cpen.style()==Qt::NoPen || this->patternedbrush ) { | ||
763 | //slowpath | ||
764 | QT_TRANS_GFX_BASE<depth,type>::drawPolygon( a, w, idx, num ); | ||
765 | } else { | ||
766 | @@ -819,29 +819,29 @@ | ||
767 | template <const int depth, const int type> | ||
768 | void QGfxTransformedRaster<depth,type>::processSpans( int n, QPoint* point, int* width ) | ||
769 | { | ||
770 | - if ( inDraw || patternedbrush && srcwidth != 0 && srcheight != 0 ) { | ||
771 | + if ( inDraw || this->patternedbrush && this->srcwidth != 0 && this->srcheight != 0 ) { | ||
772 | //in the patternedbrush case, we let blt do the transformation | ||
773 | // so we leave inDraw false. | ||
774 | - QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width ); | ||
775 | +QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width ); | ||
776 | } else { | ||
777 | inDraw = TRUE; | ||
778 | while (n--) { | ||
779 | if ( *width > 0 ) { | ||
780 | - int x=tx(point->x(),point->y())+xoffs; | ||
781 | - int y=ty(point->x(),point->y())+yoffs; | ||
782 | + int x=tx(point->x(),point->y())+this->xoffs; | ||
783 | + int y=ty(point->x(),point->y())+this->yoffs; | ||
784 | |||
785 | switch( qt_trans_screen->transformation() ) { | ||
786 | case QTransformedScreen::Rot90: | ||
787 | - vline( x, y-(*width-1), y ); | ||
788 | + this->vline( x, y-(*width-1), y ); | ||
789 | break; | ||
790 | case QTransformedScreen::Rot180: | ||
791 | - hline( x - (*width-1), x, y ); | ||
792 | + this->hline( x - (*width-1), x, y ); | ||
793 | break; | ||
794 | case QTransformedScreen::Rot270: | ||
795 | - vline( x, y, y+*width-1 ); | ||
796 | + this->vline( x, y, y+*width-1 ); | ||
797 | break; | ||
798 | default: | ||
799 | - hline( x, x+*width-1, y ); | ||
800 | + this->hline( x, x+*width-1, y ); | ||
801 | break; | ||
802 | } | ||
803 | } | ||
804 | @@ -896,14 +896,14 @@ | ||
805 | switch ( qt_trans_screen->transformation() ) { | ||
806 | case QTransformedScreen::Rot90: | ||
807 | rsx = sy; | ||
808 | - rsy = srcwidth - sx - w; | ||
809 | + rsy = this->srcwidth - sx - w; | ||
810 | break; | ||
811 | case QTransformedScreen::Rot180: | ||
812 | - rsx = srcwidth - sx - w; | ||
813 | - rsy = srcheight - sy - h; | ||
814 | + rsx = this->srcwidth - sx - w; | ||
815 | + rsy = this->srcheight - sy - h; | ||
816 | break; | ||
817 | case QTransformedScreen::Rot270: | ||
818 | - rsx = srcheight - sy - h; | ||
819 | + rsx = this->srcheight - sy - h; | ||
820 | rsy = sx; | ||
821 | break; | ||
822 | default: | ||
823 | @@ -941,39 +941,39 @@ | ||
824 | r.setCoords( tx(rx,ry), ty(rx,ry), tx(rx+w-1,ry+h-1), ty(rx+w-1,ry+h-1) ); | ||
825 | r = r.normalize(); | ||
826 | |||
827 | - QPoint oldBrushOffs = brushoffs; | ||
828 | + QPoint oldBrushOffs = this->brushoffs; | ||
829 | int brx, bry; | ||
830 | switch ( qt_trans_screen->transformation() ) { | ||
831 | case QTransformedScreen::Rot90: | ||
832 | - brx = brushoffs.y(); | ||
833 | - bry = srcwidth - brushoffs.x() - w; | ||
834 | + brx = this->brushoffs.y(); | ||
835 | + bry = this->srcwidth - this->brushoffs.x() - w; | ||
836 | break; | ||
837 | case QTransformedScreen::Rot180: | ||
838 | - brx = srcwidth - brushoffs.x() - w; | ||
839 | - bry = srcheight - brushoffs.y() - h; | ||
840 | + brx = this->srcwidth - this->brushoffs.x() - w; | ||
841 | + bry = this->srcheight - this->brushoffs.y() - h; | ||
842 | break; | ||
843 | case QTransformedScreen::Rot270: | ||
844 | - brx = srcheight - brushoffs.y() - h; | ||
845 | - bry = brushoffs.x(); | ||
846 | + brx = this->srcheight - this->brushoffs.y() - h; | ||
847 | + bry = this->brushoffs.x(); | ||
848 | break; | ||
849 | default: | ||
850 | - brx = brushoffs.x(); | ||
851 | - bry = brushoffs.y(); | ||
852 | + brx = this->brushoffs.x(); | ||
853 | + bry = this->brushoffs.y(); | ||
854 | break; | ||
855 | } | ||
856 | - brushoffs = QPoint( brx, bry ); | ||
857 | + this->brushoffs = QPoint( brx, bry ); | ||
858 | |||
859 | - int oldsw = srcwidth; | ||
860 | - int oldsh = srcheight; | ||
861 | - QSize s = qt_screen->mapToDevice( QSize(srcwidth,srcheight) ); | ||
862 | - srcwidth = s.width(); | ||
863 | - srcheight = s.height(); | ||
864 | + int oldsw = this->srcwidth; | ||
865 | + int oldsh = this->srcheight; | ||
866 | + QSize s = qt_screen->mapToDevice( QSize(this->srcwidth,this->srcheight) ); | ||
867 | + this->srcwidth = s.width(); | ||
868 | + this->srcheight = s.height(); | ||
869 | |||
870 | QT_TRANS_GFX_BASE<depth,type>::tiledBlt( r.x(), r.y(), r.width(), r.height() ); | ||
871 | |||
872 | - srcwidth = oldsw; | ||
873 | - srcheight = oldsh; | ||
874 | - brushoffs = oldBrushOffs; | ||
875 | + this->srcwidth = oldsw; | ||
876 | + this->srcheight = oldsh; | ||
877 | + this->brushoffs = oldBrushOffs; | ||
878 | inDraw = FALSE; | ||
879 | } | ||
880 | |||
881 | diff -ur qt-2.3.7-old/src/kernel/qgfxvfb_qws.cpp qt-2.3.7/src/kernel/qgfxvfb_qws.cpp | ||
882 | --- qt-2.3.7-old/src/kernel/qgfxvfb_qws.cpp2004-07-23 15:22:56.000000000 +0200 | ||
883 | +++ qt-2.3.7/src/kernel/qgfxvfb_qws.cpp2004-07-23 15:42:01.000000000 +0200 | ||
884 | @@ -31,7 +31,6 @@ | ||
885 | **********************************************************************/ | ||
886 | |||
887 | #include "qgfxraster_qws.h" | ||
888 | - | ||
889 | #ifndef QT_NO_QWS_VFB | ||
890 | |||
891 | #include <sys/ipc.h> | ||
892 | @@ -140,8 +139,8 @@ | ||
893 | void QGfxVFb<depth,type>::drawPoint( int x, int y ) | ||
894 | { | ||
895 | QWSDisplay::grab( TRUE ); | ||
896 | - if ( is_screen_gfx ) | ||
897 | -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) ); | ||
898 | + if ( this->is_screen_gfx ) | ||
899 | +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) ); | ||
900 | QGfxRaster<depth,type>::drawPoint( x, y ); | ||
901 | QWSDisplay::ungrab(); | ||
902 | } | ||
903 | @@ -150,8 +149,8 @@ | ||
904 | void QGfxVFb<depth,type>::drawPoints( const QPointArray &pa,int x,int y ) | ||
905 | { | ||
906 | QWSDisplay::grab( TRUE ); | ||
907 | - if ( is_screen_gfx ) | ||
908 | -qvfb_screen->setDirty( clipbounds ); | ||
909 | + if ( this->is_screen_gfx ) | ||
910 | +qvfb_screen->setDirty( this->clipbounds ); | ||
911 | QGfxRaster<depth,type>::drawPoints( pa, x, y ); | ||
912 | QWSDisplay::ungrab(); | ||
913 | } | ||
914 | @@ -160,9 +159,9 @@ | ||
915 | void QGfxVFb<depth,type>::drawLine( int x1,int y1,int x2,int y2 ) | ||
916 | { | ||
917 | QWSDisplay::grab( TRUE ); | ||
918 | - if ( is_screen_gfx ) { | ||
919 | + if ( this->is_screen_gfx ) { | ||
920 | QRect r; | ||
921 | -r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs ); | ||
922 | +r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs ); | ||
923 | qvfb_screen->setDirty( r.normalize() ); | ||
924 | } | ||
925 | QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 ); | ||
926 | @@ -173,8 +172,8 @@ | ||
927 | void QGfxVFb<depth,type>::fillRect( int x,int y,int w,int h ) | ||
928 | { | ||
929 | QWSDisplay::grab( TRUE ); | ||
930 | - if ( is_screen_gfx ) | ||
931 | -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) ); | ||
932 | + if ( this->is_screen_gfx ) | ||
933 | +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) ); | ||
934 | QGfxRaster<depth,type>::fillRect( x, y, w, h ); | ||
935 | QWSDisplay::ungrab(); | ||
936 | } | ||
937 | @@ -183,8 +182,8 @@ | ||
938 | void QGfxVFb<depth,type>::drawPolyline( const QPointArray &pa,int x,int y ) | ||
939 | { | ||
940 | QWSDisplay::grab( TRUE ); | ||
941 | - if ( is_screen_gfx ) | ||
942 | -qvfb_screen->setDirty( clipbounds ); | ||
943 | + if ( this->is_screen_gfx ) | ||
944 | +qvfb_screen->setDirty( this->clipbounds ); | ||
945 | QGfxRaster<depth,type>::drawPolyline( pa, x, y ); | ||
946 | QWSDisplay::ungrab(); | ||
947 | } | ||
948 | @@ -193,8 +192,8 @@ | ||
949 | void QGfxVFb<depth,type>::drawPolygon( const QPointArray &pa,bool w,int x,int y ) | ||
950 | { | ||
951 | QWSDisplay::grab( TRUE ); | ||
952 | - if ( is_screen_gfx ) | ||
953 | -qvfb_screen->setDirty( clipbounds ); | ||
954 | + if ( this->is_screen_gfx ) | ||
955 | +qvfb_screen->setDirty( this->clipbounds ); | ||
956 | QGfxRaster<depth,type>::drawPolygon( pa, w, x, y ); | ||
957 | QWSDisplay::ungrab(); | ||
958 | } | ||
959 | @@ -203,8 +202,8 @@ | ||
960 | void QGfxVFb<depth,type>::blt( int x,int y,int w,int h, int sx, int sy ) | ||
961 | { | ||
962 | QWSDisplay::grab( TRUE ); | ||
963 | - if ( is_screen_gfx ) | ||
964 | -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) ); | ||
965 | + if ( this->is_screen_gfx ) | ||
966 | +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) ); | ||
967 | QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy ); | ||
968 | QWSDisplay::ungrab(); | ||
969 | } | ||
970 | @@ -215,8 +214,8 @@ | ||
971 | QWSDisplay::grab( TRUE ); | ||
972 | int dy = sy - y; | ||
973 | int dx = sx - x; | ||
974 | - if ( is_screen_gfx ) | ||
975 | -qvfb_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs, | ||
976 | + if ( this->is_screen_gfx ) | ||
977 | +qvfb_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs, | ||
978 | w+abs(dx), h+abs(dy)) ); | ||
979 | QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy ); | ||
980 | QWSDisplay::ungrab(); | ||
981 | @@ -227,8 +226,8 @@ | ||
982 | void QGfxVFb<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy ) | ||
983 | { | ||
984 | QWSDisplay::grab( TRUE ); | ||
985 | - if ( is_screen_gfx ) | ||
986 | -qvfb_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) ); | ||
987 | + if ( this->is_screen_gfx ) | ||
988 | +qvfb_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) ); | ||
989 | QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy ); | ||
990 | QWSDisplay::ungrab(); | ||
991 | } | ||
992 | @@ -238,8 +237,8 @@ | ||
993 | void QGfxVFb<depth,type>::tiledBlt( int x,int y,int w,int h ) | ||
994 | { | ||
995 | QWSDisplay::grab( TRUE ); | ||
996 | - if ( is_screen_gfx ) | ||
997 | -qvfb_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) ); | ||
998 | + if ( this->is_screen_gfx ) | ||
999 | +qvfb_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) ); | ||
1000 | QGfxRaster<depth,type>::tiledBlt( x, y, w, h ); | ||
1001 | QWSDisplay::ungrab(); | ||
1002 | } | ||
1003 | diff -ur qt-2.3.7-old/src/kernel/qkeyboard_qws.cpp qt-2.3.7/src/kernel/qkeyboard_qws.cpp | ||
1004 | --- qt-2.3.7-old/src/kernel/qkeyboard_qws.cpp2004-07-23 15:22:56.000000000 +0200 | ||
1005 | +++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp2004-07-23 15:33:46.000000000 +0200 | ||
1006 | @@ -238,7 +238,7 @@ | ||
1007 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 63 | ||
1008 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 64 | ||
1009 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 65 | ||
1010 | - { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 66 | ||
1011 | + { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 | ||
1012 | { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 | ||
1013 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 68 | ||
1014 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 69 | ||
1015 | diff -ur qt-2.3.7-old/src/kernel/qwindowsystem_qws.cpp qt-2.3.7/src/kernel/qwindowsystem_qws.cpp | ||
1016 | --- qt-2.3.7-old/src/kernel/qwindowsystem_qws.cpp2004-07-23 15:22:56.000000000 +0200 | ||
1017 | +++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp2004-07-23 15:33:47.000000000 +0200 | ||
230 | @@ -844,6 +844,18 @@ | 1018 | @@ -844,6 +844,18 @@ |
231 | { | 1019 | { |
232 | } | 1020 | } |
@@ -254,8 +1042,125 @@ | |||
254 | #endif | 1042 | #endif |
255 | focusw = 0; | 1043 | focusw = 0; |
256 | mouseGrabber = 0; | 1044 | mouseGrabber = 0; |
257 | --- qt-2.3.7/src/widgets/qcommonstyle.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200 | 1045 | diff -ur qt-2.3.7-old/src/tools/qcstring.h qt-2.3.7/src/tools/qcstring.h |
258 | +++ qt-2.3.7/src/widgets/qcommonstyle.cpp2004-04-15 21:06:51.240855770 +0200 | 1046 | --- qt-2.3.7-old/src/tools/qcstring.h2004-07-23 15:22:56.000000000 +0200 |
1047 | +++ qt-2.3.7/src/tools/qcstring.h2004-07-23 15:42:01.000000000 +0200 | ||
1048 | @@ -119,7 +119,7 @@ | ||
1049 | // We want to keep source compatibility for 2.x | ||
1050 | // ### TODO for 4.0: completely remove these and the cstr* functions | ||
1051 | |||
1052 | -#if !defined(QT_GENUINE_STR) | ||
1053 | +#if 0 | ||
1054 | |||
1055 | #undefstrlen | ||
1056 | #define strlen qstrlen | ||
1057 | diff -ur qt-2.3.7-old/src/tools/qglobal.h qt-2.3.7/src/tools/qglobal.h | ||
1058 | --- qt-2.3.7-old/src/tools/qglobal.h2004-07-23 15:22:56.000000000 +0200 | ||
1059 | +++ qt-2.3.7/src/tools/qglobal.h2004-07-23 15:42:01.000000000 +0200 | ||
1060 | @@ -207,8 +207,16 @@ | ||
1061 | #if __GNUC__ == 2 && __GNUC_MINOR__ == 96 | ||
1062 | #define Q_FP_CCAST_BROKEN | ||
1063 | #endif | ||
1064 | +/* ARM gcc pads structs to 32 bits, even when they contain a single | ||
1065 | + char, or short. We tell gcc to pack QChars to 16 bits, to avoid | ||
1066 | + QString bloat. However, gcc 3.4 doesn't allow us to create references to | ||
1067 | + members of a packed struct. (Pointers are OK, because then you | ||
1068 | + supposedly know what you are doing.) */ | ||
1069 | #if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) | ||
1070 | #define Q_PACKED __attribute__ ((packed)) | ||
1071 | +# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 | ||
1072 | +# define Q_NO_PACKED_REFERENCE | ||
1073 | +# endif | ||
1074 | #endif | ||
1075 | #elif defined(__xlC__) | ||
1076 | #define _CC_XLC_ | ||
1077 | diff -ur qt-2.3.7-old/src/tools/qmodules.h qt-2.3.7/src/tools/qmodules.h | ||
1078 | --- qt-2.3.7-old/src/tools/qmodules.h2004-07-23 15:22:56.000000000 +0200 | ||
1079 | +++ qt-2.3.7/src/tools/qmodules.h2004-07-23 16:03:09.000000000 +0200 | ||
1080 | @@ -1,14 +1,11 @@ | ||
1081 | -#ifndef QT_H | ||
1082 | -#endif // QT_H | ||
1083 | - | ||
1084 | +// These modules are licensed to you | ||
1085 | #define QT_MODULE_TOOLS | ||
1086 | #define QT_MODULE_KERNEL | ||
1087 | #define QT_MODULE_WIDGETS | ||
1088 | #define QT_MODULE_DIALOGS | ||
1089 | - | ||
1090 | #define QT_MODULE_ICONVIEW | ||
1091 | #define QT_MODULE_WORKSPACE | ||
1092 | -#define QT_MODULE_TABLE | ||
1093 | +#define QT_MODULE_NETWORK | ||
1094 | #define QT_MODULE_CANVAS | ||
1095 | +#define QT_MODULE_TABLE | ||
1096 | #define QT_MODULE_XML | ||
1097 | -#define QT_MODULE_NETWORK | ||
1098 | diff -ur qt-2.3.7-old/src/tools/qsortedlist.h qt-2.3.7/src/tools/qsortedlist.h | ||
1099 | --- qt-2.3.7-old/src/tools/qsortedlist.h2004-07-23 15:22:56.000000000 +0200 | ||
1100 | +++ qt-2.3.7/src/tools/qsortedlist.h2004-07-23 15:42:01.000000000 +0200 | ||
1101 | @@ -48,7 +48,7 @@ | ||
1102 | public: | ||
1103 | QSortedList() {} | ||
1104 | QSortedList( const QSortedList<type> &l ) : QList<type>(l) {} | ||
1105 | - ~QSortedList() { clear(); } | ||
1106 | + ~QSortedList() { this->clear(); } | ||
1107 | QSortedList<type> &operator=(const QSortedList<type> &l) | ||
1108 | { return (QSortedList<type>&)QList<type>::operator=(l); } | ||
1109 | |||
1110 | diff -ur qt-2.3.7-old/src/tools/qstring.cpp qt-2.3.7/src/tools/qstring.cpp | ||
1111 | --- qt-2.3.7-old/src/tools/qstring.cpp2004-07-23 15:22:56.000000000 +0200 | ||
1112 | +++ qt-2.3.7/src/tools/qstring.cpp2004-07-23 15:44:25.000000000 +0200 | ||
1113 | @@ -14469,7 +14469,11 @@ | ||
1114 | return qt_winQString2MB( *this ); | ||
1115 | #endif | ||
1116 | #ifdef _WS_QWS_ | ||
1117 | - return utf8(); // ##### if there is ANY 8 bit format supported? | ||
1118 | + QTextCodec* codec = QTextCodec::codecForLocale(); | ||
1119 | + return codec | ||
1120 | + ? codec->fromUnicode(*this) | ||
1121 | + : utf8(); | ||
1122 | + //return latin1(); // ##### if there is ANY 8 bit format supported? | ||
1123 | #endif | ||
1124 | #endif | ||
1125 | } | ||
1126 | @@ -14515,7 +14519,12 @@ | ||
1127 | return qt_winMB2QString( local8Bit ); | ||
1128 | #endif | ||
1129 | #ifdef _WS_QWS_ | ||
1130 | - return fromUtf8(local8Bit,len); | ||
1131 | + QTextCodec* codec = QTextCodec::codecForLocale(); | ||
1132 | + if( len < 0) len = qstrlen(local8Bit); | ||
1133 | + return codec | ||
1134 | + ? codec->toUnicode(local8Bit, len) | ||
1135 | + : QString::fromUtf8(local8Bit,len); | ||
1136 | +// return fromLatin1(local8Bit,len); | ||
1137 | #endif | ||
1138 | #endif // QT_NO_TEXTCODEC | ||
1139 | } | ||
1140 | diff -ur qt-2.3.7-old/src/tools/qstring.h qt-2.3.7/src/tools/qstring.h | ||
1141 | --- qt-2.3.7-old/src/tools/qstring.h2004-07-23 15:22:56.000000000 +0200 | ||
1142 | +++ qt-2.3.7/src/tools/qstring.h2004-07-23 15:42:01.000000000 +0200 | ||
1143 | @@ -163,8 +163,16 @@ | ||
1144 | bool isLetterOrNumber() const; | ||
1145 | bool isDigit() const; | ||
1146 | |||
1147 | + | ||
1148 | +#ifdef Q_NO_PACKED_REFERENCE | ||
1149 | + uchar& cell() { return *(&cl); } | ||
1150 | + uchar& row() { return *(&rw); } | ||
1151 | +#else | ||
1152 | uchar& cell() { return cl; } | ||
1153 | - uchar& row() { return rw; } | ||
1154 | + uchar& row() { return rw; } | ||
1155 | +#endif | ||
1156 | + | ||
1157 | + | ||
1158 | uchar cell() const { return cl; } | ||
1159 | uchar row() const { return rw; } | ||
1160 | |||
1161 | diff -ur qt-2.3.7-old/src/widgets/qcommonstyle.cpp qt-2.3.7/src/widgets/qcommonstyle.cpp | ||
1162 | --- qt-2.3.7-old/src/widgets/qcommonstyle.cpp2004-07-23 15:22:56.000000000 +0200 | ||
1163 | +++ qt-2.3.7/src/widgets/qcommonstyle.cpp2004-07-23 15:38:13.000000000 +0200 | ||
259 | @@ -566,7 +566,7 @@ | 1164 | @@ -566,7 +566,7 @@ |
260 | bool enabled, bool active ) | 1165 | bool enabled, bool active ) |
261 | { | 1166 | { |
@@ -265,8 +1170,9 @@ | |||
265 | if (draw_menu_bar_impl != 0) { | 1170 | if (draw_menu_bar_impl != 0) { |
266 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; | 1171 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; |
267 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); | 1172 | (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 | 1173 | diff -ur qt-2.3.7-old/src/widgets/qlistview.cpp qt-2.3.7/src/widgets/qlistview.cpp |
269 | +++ qt-2.3.7/src/widgets/qlistview.cpp2004-04-15 21:06:51.243855303 +0200 | 1174 | --- qt-2.3.7-old/src/widgets/qlistview.cpp2004-07-23 15:22:56.000000000 +0200 |
1175 | +++ qt-2.3.7/src/widgets/qlistview.cpp2004-07-23 15:38:13.000000000 +0200 | ||
270 | @@ -4968,9 +4968,9 @@ | 1176 | @@ -4968,9 +4968,9 @@ |
271 | l = l->childItem ? l->childItem : l->siblingItem; | 1177 | l = l->childItem ? l->childItem : l->siblingItem; |
272 | 1178 | ||
@@ -280,8 +1186,145 @@ | |||
280 | 1186 | ||
281 | if ( s.width() > s.height() * 3 ) | 1187 | if ( s.width() > s.height() * 3 ) |
282 | s.setHeight( s.width() / 3 ); | 1188 | s.setHeight( s.width() / 3 ); |
283 | --- qt-2.3.7/src/widgets/qtoolbutton.cpp~qte237-all2003-07-17 03:20:27.000000000 +0200 | 1189 | diff -ur qt-2.3.7-old/src/widgets/qscrollview.cpp qt-2.3.7/src/widgets/qscrollview.cpp |
284 | +++ qt-2.3.7/src/widgets/qtoolbutton.cpp2004-04-15 21:06:51.243855303 +0200 | 1190 | --- qt-2.3.7-old/src/widgets/qscrollview.cpp2004-07-23 19:25:18.000000000 +0200 |
1191 | +++ qt-2.3.7/src/widgets/qscrollview.cpp2004-07-23 19:23:10.000000000 +0200 | ||
1192 | @@ -526,15 +526,16 @@ | ||
1193 | this, SLOT( doDragAutoScroll() ) ); | ||
1194 | #endif | ||
1195 | |||
1196 | - connect( &d->hbar, SIGNAL( valueChanged( int ) ), | ||
1197 | -this, SLOT( hslide( int ) ) ); | ||
1198 | - connect( &d->vbar, SIGNAL( valueChanged( int ) ), | ||
1199 | -this, SLOT( vslide( int ) ) ); | ||
1200 | + connect( &d->hbar, SIGNAL( valueChanged(int) ), | ||
1201 | +this, SLOT( hslide(int) ) ); | ||
1202 | + connect( &d->vbar, SIGNAL( valueChanged(int) ), | ||
1203 | +this, SLOT( vslide(int) ) ); | ||
1204 | d->viewport.installEventFilter( this ); | ||
1205 | |||
1206 | setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); | ||
1207 | setLineWidth( style().defaultFrameWidth() ); | ||
1208 | setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); | ||
1209 | + | ||
1210 | } | ||
1211 | |||
1212 | |||
1213 | @@ -683,6 +684,11 @@ | ||
1214 | h-tmarg-bmarg - (showh ? hsbExt : 0) ); | ||
1215 | } | ||
1216 | |||
1217 | +/* | ||
1218 | + The surrounding environment (or application, if there is no | ||
1219 | + environment, may set this. Requires Qt >= 2.3.8. | ||
1220 | +*/ | ||
1221 | +bool qt_left_hand_scrollbars = FALSE; | ||
1222 | |||
1223 | /*! | ||
1224 | Updates scrollbars - all possibilities considered. You should never | ||
1225 | @@ -786,45 +792,50 @@ | ||
1226 | |||
1227 | // Position the scrollbars, viewport, and corner widget. | ||
1228 | int bottom; | ||
1229 | + int xoffset = ( qt_left_hand_scrollbars && ( showv || cornerWidget() ) ) ? vsbExt : 0; | ||
1230 | + int xpos = qt_left_hand_scrollbars ? 0 : w-vsbExt; | ||
1231 | + xpos = (style() == WindowsStyle) && qt_left_hand_scrollbars ? xpos + fw : xpos - fw; | ||
1232 | + int ypos = tmarg; | ||
1233 | + ypos = (style() == WindowsStyle) ? ypos +fw : 0; | ||
1234 | if ( showh ) { | ||
1235 | int right = ( showv || cornerWidget() ) ? w-vsbExt : w; | ||
1236 | if ( style() == WindowsStyle ) | ||
1237 | - setHBarGeometry(d->hbar, fw, h-hsbExt-fw, | ||
1238 | + setHBarGeometry(d->hbar, fw + xoffset , h-hsbExt-fw, | ||
1239 | right-fw-fw, hsbExt ); | ||
1240 | else | ||
1241 | - setHBarGeometry(d->hbar, 0, h-hsbExt, right, | ||
1242 | + setHBarGeometry(d->hbar, 0+ xoffset, h-hsbExt, right, | ||
1243 | hsbExt ); | ||
1244 | bottom=h-hsbExt; | ||
1245 | } else { | ||
1246 | bottom=h; | ||
1247 | } | ||
1248 | if ( showv ) { | ||
1249 | -clipper()->setGeometry( lmarg, tmarg, | ||
1250 | +clipper()->setGeometry( lmarg + xoffset, tmarg, | ||
1251 | w-vsbExt-lmarg-rmarg, | ||
1252 | bottom-tmarg-bmarg ); | ||
1253 | d->viewportResized( w-vsbExt-lmarg-rmarg, bottom-tmarg-bmarg ); | ||
1254 | if ( style() == WindowsStyle ) | ||
1255 | - changeFrameRect(QRect(0, 0, w, h) ); | ||
1256 | + changeFrameRect(QRect(xoffset, 0, w, h) ); | ||
1257 | else | ||
1258 | - changeFrameRect(QRect(0, 0, w-vsbExt, bottom)); | ||
1259 | + changeFrameRect(QRect(xoffset, 0, w-vsbExt, bottom)); | ||
1260 | if (cornerWidget()) { | ||
1261 | if ( style() == WindowsStyle ) | ||
1262 | - setVBarGeometry( d->vbar, w-vsbExt-fw, | ||
1263 | - fw, vsbExt, | ||
1264 | - h-hsbExt-fw-fw ); | ||
1265 | + setVBarGeometry( d->vbar, xpos, | ||
1266 | + ypos, vsbExt, | ||
1267 | + bottom-fw-ypos ); | ||
1268 | else | ||
1269 | - setVBarGeometry( d->vbar, w-vsbExt, 0, | ||
1270 | + setVBarGeometry( d->vbar, xpos, ypos, | ||
1271 | vsbExt, | ||
1272 | - h-hsbExt ); | ||
1273 | + bottom-ypos ); | ||
1274 | } | ||
1275 | else { | ||
1276 | if ( style() == WindowsStyle ) | ||
1277 | - setVBarGeometry( d->vbar, w-vsbExt-fw, | ||
1278 | - fw, vsbExt, | ||
1279 | - bottom-fw-fw ); | ||
1280 | + setVBarGeometry( d->vbar, xpos, | ||
1281 | + ypos, vsbExt, | ||
1282 | + bottom-fw-ypos ); | ||
1283 | else | ||
1284 | - setVBarGeometry( d->vbar, w-vsbExt, 0, | ||
1285 | - vsbExt, bottom ); | ||
1286 | + setVBarGeometry( d->vbar, xpos, ypos, | ||
1287 | + vsbExt, bottom-ypos ); | ||
1288 | } | ||
1289 | } else { | ||
1290 | if ( style() == WindowsStyle ) | ||
1291 | @@ -837,12 +848,12 @@ | ||
1292 | } | ||
1293 | if ( d->corner ) { | ||
1294 | if ( style() == WindowsStyle ) | ||
1295 | - d->corner->setGeometry( w-vsbExt-fw, | ||
1296 | + d->corner->setGeometry( xpos, | ||
1297 | h-hsbExt-fw, | ||
1298 | vsbExt, | ||
1299 | hsbExt ); | ||
1300 | else | ||
1301 | - d->corner->setGeometry( w-vsbExt, | ||
1302 | + d->corner->setGeometry( xpos, | ||
1303 | h-hsbExt, | ||
1304 | vsbExt, | ||
1305 | hsbExt ); | ||
1306 | @@ -1266,6 +1277,9 @@ | ||
1307 | case QEvent::LayoutHint: | ||
1308 | d->autoResizeHint(this); | ||
1309 | break; | ||
1310 | +case QEvent::WindowActivate: | ||
1311 | +case QEvent::WindowDeactivate: | ||
1312 | + return TRUE; | ||
1313 | default: | ||
1314 | break; | ||
1315 | } | ||
1316 | @@ -1675,7 +1689,7 @@ | ||
1317 | } | ||
1318 | |||
1319 | /*! | ||
1320 | - Scrolls the content by \a x to the left and \a y upwards. | ||
1321 | + Scrolls the content by \a dx to the left and \a dy upwards. | ||
1322 | */ | ||
1323 | void QScrollView::scrollBy( int dx, int dy ) | ||
1324 | { | ||
1325 | diff -ur qt-2.3.7-old/src/widgets/qtoolbutton.cpp qt-2.3.7/src/widgets/qtoolbutton.cpp | ||
1326 | --- qt-2.3.7-old/src/widgets/qtoolbutton.cpp2004-07-23 15:22:56.000000000 +0200 | ||
1327 | +++ qt-2.3.7/src/widgets/qtoolbutton.cpp2004-07-23 15:38:13.000000000 +0200 | ||
285 | @@ -230,7 +230,7 @@ | 1328 | @@ -230,7 +230,7 @@ |
286 | else | 1329 | else |
287 | QToolTip::add( this, textLabel ); | 1330 | QToolTip::add( this, textLabel ); |
@@ -309,157 +1352,3 @@ | |||
309 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); | 1352 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); |
310 | w = pm.width(); | 1353 | w = pm.width(); |
311 | h = pm.height(); | 1354 | h = pm.height(); |
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 | ||
314 | @@ -238,7 +238,7 @@ | ||
315 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 63 | ||
316 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 64 | ||
317 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 65 | ||
318 | - { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 66 | ||
319 | + { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 | ||
320 | { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 | ||
321 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 68 | ||
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 | ||
324 | +++ qt-2.3.7/configs/linux-generic-g++-shared2004-04-15 21:06:51.244855148 +0200 | ||
325 | @@ -36,7 +36,7 @@ | ||
326 | SYSCONF_LIBS_YACC= | ||
327 | |||
328 | # Linking applications | ||
329 | -SYSCONF_LINK = gcc | ||
330 | +SYSCONF_LINK = g++ | ||
331 | SYSCONF_LFLAGS = | ||
332 | SYSCONF_LIBS = | ||
333 | |||
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 | ||
336 | @@ -36,7 +36,7 @@ | ||
337 | SYSCONF_LIBS_YACC= | ||
338 | |||
339 | # Linking applications | ||
340 | -SYSCONF_LINK = gcc | ||
341 | +SYSCONF_LINK = g++ | ||
342 | SYSCONF_LFLAGS = | ||
343 | SYSCONF_LIBS = | ||
344 | |||
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 | ||
347 | @@ -36,7 +36,7 @@ | ||
348 | SYSCONF_LIBS_YACC= | ||
349 | |||
350 | # Linking applications | ||
351 | -SYSCONF_LINK = gcc | ||
352 | +SYSCONF_LINK = g++ | ||
353 | SYSCONF_LFLAGS = | ||
354 | SYSCONF_LIBS = | ||
355 | |||
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 | ||
358 | @@ -36,7 +36,7 @@ | ||
359 | SYSCONF_LIBS_YACC= | ||
360 | |||
361 | # Linking applications | ||
362 | -SYSCONF_LINK = gcc | ||
363 | +SYSCONF_LINK = g++ | ||
364 | SYSCONF_LFLAGS = | ||
365 | SYSCONF_LIBS = | ||
366 | |||
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 | ||
369 | @@ -36,7 +36,7 @@ | ||
370 | SYSCONF_LIBS_YACC= | ||
371 | |||
372 | # Linking applications | ||
373 | -SYSCONF_LINK = gcc | ||
374 | +SYSCONF_LINK = g++ | ||
375 | SYSCONF_LFLAGS = | ||
376 | SYSCONF_LIBS = | ||
377 | |||
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 | ||
380 | @@ -36,7 +36,7 @@ | ||
381 | SYSCONF_LIBS_YACC= | ||
382 | |||
383 | # Linking applications | ||
384 | -SYSCONF_LINK = gcc | ||
385 | +SYSCONF_LINK = g++ | ||
386 | SYSCONF_LFLAGS = | ||
387 | SYSCONF_LIBS = | ||
388 | |||
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 | ||
391 | @@ -36,7 +36,7 @@ | ||
392 | SYSCONF_LIBS_YACC= | ||
393 | |||
394 | # Linking applications | ||
395 | -SYSCONF_LINK = gcc | ||
396 | +SYSCONF_LINK = g++ | ||
397 | SYSCONF_LFLAGS = | ||
398 | SYSCONF_LIBS = | ||
399 | |||
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 | ||
402 | @@ -36,7 +36,7 @@ | ||
403 | SYSCONF_LIBS_YACC= | ||
404 | |||
405 | # Linking applications | ||
406 | -SYSCONF_LINK = gcc | ||
407 | +SYSCONF_LINK = g++ | ||
408 | SYSCONF_LFLAGS = | ||
409 | SYSCONF_LIBS = | ||
410 | |||
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 | ||
413 | @@ -36,7 +36,7 @@ | ||
414 | SYSCONF_LIBS_YACC= | ||
415 | |||
416 | # Linking applications | ||
417 | -SYSCONF_LINK = gcc | ||
418 | +SYSCONF_LINK = g++ | ||
419 | SYSCONF_LFLAGS = | ||
420 | SYSCONF_LIBS = -lm | ||
421 | |||
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 | ||
424 | @@ -36,7 +36,7 @@ | ||
425 | SYSCONF_LIBS_YACC= | ||
426 | |||
427 | # Linking applications | ||
428 | -SYSCONF_LINK = gcc | ||
429 | +SYSCONF_LINK = g++ | ||
430 | SYSCONF_LFLAGS = | ||
431 | SYSCONF_LIBS = -lm | ||
432 | |||
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 | ||
435 | @@ -36,7 +36,7 @@ | ||
436 | SYSCONF_LIBS_YACC= | ||
437 | |||
438 | # Linking applications | ||
439 | -SYSCONF_LINK = gcc | ||
440 | +SYSCONF_LINK = g++ | ||
441 | SYSCONF_LFLAGS = | ||
442 | SYSCONF_LIBS = -lm | ||
443 | |||
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 | ||
446 | @@ -36,7 +36,7 @@ | ||
447 | SYSCONF_LIBS_YACC= | ||
448 | |||
449 | # Linking applications | ||
450 | -SYSCONF_LINK = gcc | ||
451 | +SYSCONF_LINK = g++ | ||
452 | SYSCONF_LFLAGS = | ||
453 | SYSCONF_LIBS = -lm | ||
454 | |||
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 | ||
457 | @@ -2201,7 +2201,7 @@ | ||
458 | t2 = srcHeight * dstWidth; | ||
459 | |||
460 | if (((sModeQStr == "ScaleMin") && (t1 > t2)) || | ||
461 | - ((sModeQStr == "ScaleMax") && (t2 < t2))) { | ||
462 | + ((sModeQStr == "ScaleMax") && (t1 < t2))) { | ||
463 | dstHeight = t2 / srcWidth; | ||
464 | } else if (sModeQStr != "ScaleFree") { | ||
465 | dstWidth = t1 / srcHeight; | ||