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.patch | 186 |
1 files changed, 122 insertions, 64 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-gcc34.patch b/qt/qt-2.3.7.patch/qte237-gcc34.patch index 856028d..9a0f28c 100644 --- a/qt/qt-2.3.7.patch/qte237-gcc34.patch +++ b/qt/qt-2.3.7.patch/qte237-gcc34.patch | |||
@@ -1,51 +1,7 @@ | |||
1 | diff -ur qt-2.3.7_clean/include/qcstring.h qt-2.3.7/include/qcstring.h | 1 | diff -ur qt-2.3.7_old/src/kernel/qgfxtransformed_qws.cpp qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp |
2 | --- qt-2.3.7_clean/include/qcstring.h2004-06-04 02:17:53.000000000 +0200 | 2 | --- qt-2.3.7_old/src/kernel/qgfxtransformed_qws.cpp2004-09-10 21:08:04.000000000 +0200 |
3 | +++ qt-2.3.7/include/qcstring.h2004-06-04 02:24:25.000000000 +0200 | 3 | +++ qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp2004-09-10 21:08:42.000000000 +0200 |
4 | @@ -119,7 +119,7 @@ | ||
5 | // We want to keep source compatibility for 2.x | ||
6 | // ### TODO for 4.0: completely remove these and the cstr* functions | ||
7 | |||
8 | -#if !defined(QT_GENUINE_STR) | ||
9 | +#if 0 | ||
10 | |||
11 | #undefstrlen | ||
12 | #define strlen qstrlen | ||
13 | diff -ur qt-2.3.7_clean/include/qglobal.h qt-2.3.7/include/qglobal.h | ||
14 | --- qt-2.3.7_clean/include/qglobal.h2004-06-04 02:17:53.000000000 +0200 | ||
15 | +++ qt-2.3.7/include/qglobal.h2004-06-04 02:29:41.000000000 +0200 | ||
16 | @@ -207,8 +207,16 @@ | ||
17 | #if __GNUC__ == 2 && __GNUC_MINOR__ == 96 | ||
18 | #define Q_FP_CCAST_BROKEN | ||
19 | #endif | ||
20 | +/* ARM gcc pads structs to 32 bits, even when they contain a single | ||
21 | + char, or short. We tell gcc to pack QChars to 16 bits, to avoid | ||
22 | + QString bloat. However, gcc 3.4 doesn't allow us to create references to | ||
23 | + members of a packed struct. (Pointers are OK, because then you | ||
24 | + supposedly know what you are doing.) */ | ||
25 | #if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) | ||
26 | #define Q_PACKED __attribute__ ((packed)) | ||
27 | +# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 | ||
28 | +# define Q_NO_PACKED_REFERENCE | ||
29 | +# endif | ||
30 | #endif | ||
31 | #elif defined(__xlC__) | ||
32 | #define _CC_XLC_ | ||
33 | diff -ur qt-2.3.7_clean/include/qsortedlist.h qt-2.3.7/include/qsortedlist.h | ||
34 | --- qt-2.3.7_clean/include/qsortedlist.h2004-06-04 02:17:53.000000000 +0200 | ||
35 | +++ qt-2.3.7/include/qsortedlist.h2004-06-04 02:24:25.000000000 +0200 | ||
36 | @@ -48,7 +48,7 @@ | ||
37 | public: | ||
38 | QSortedList() {} | ||
39 | QSortedList( const QSortedList<type> &l ) : QList<type>(l) {} | ||
40 | - ~QSortedList() { clear(); } | ||
41 | + ~QSortedList() { this->clear(); } | ||
42 | QSortedList<type> &operator=(const QSortedList<type> &l) | ||
43 | { return (QSortedList<type>&)QList<type>::operator=(l); } | ||
44 | |||
45 | diff -ur qt-2.3.7_clean/src/kernel/qgfxtransformed_qws.cpp qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp | ||
46 | --- qt-2.3.7_clean/src/kernel/qgfxtransformed_qws.cpp2004-06-04 02:17:53.000000000 +0200 | ||
47 | +++ qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp2004-06-04 02:24:25.000000000 +0200 | ||
48 | @@ -671,11 +671,11 @@ | 4 | @@ -671,11 +671,11 @@ |
49 | inline int tx( int x, int y ) { | 5 | inline int tx( int x, int y ) { |
50 | switch ( qt_trans_screen->transformation() ) { | 6 | switch ( qt_trans_screen->transformation() ) { |
51 | case QTransformedScreen::Rot90: | 7 | case QTransformedScreen::Rot90: |
@@ -248,11 +204,11 @@ diff -ur qt-2.3.7_clean/src/kernel/qgfxtransformed_qws.cpp qt-2.3.7/src/kernel/q | |||
248 | + this->brushoffs = oldBrushOffs; | 204 | + this->brushoffs = oldBrushOffs; |
249 | inDraw = FALSE; | 205 | inDraw = FALSE; |
250 | } | 206 | } |
251 | 207 | ||
252 | diff -ur qt-2.3.7_clean/src/kernel/qgfxvfb_qws.cpp qt-2.3.7/src/kernel/qgfxvfb_qws.cpp | 208 | diff -ur qt-2.3.7_old/src/kernel/qgfxvfb_qws.cpp qt-2.3.7/src/kernel/qgfxvfb_qws.cpp |
253 | --- qt-2.3.7_clean/src/kernel/qgfxvfb_qws.cpp2004-06-04 02:17:53.000000000 +0200 | 209 | --- qt-2.3.7_old/src/kernel/qgfxvfb_qws.cpp2004-09-10 21:08:04.000000000 +0200 |
254 | +++ qt-2.3.7/src/kernel/qgfxvfb_qws.cpp2004-06-04 02:24:25.000000000 +0200 | 210 | +++ qt-2.3.7/src/kernel/qgfxvfb_qws.cpp2004-09-10 21:08:42.000000000 +0200 |
255 | @@ -31,7 +31,6 @@ | 211 | @@ -31,7 +31,6 @@ |
256 | **********************************************************************/ | 212 | **********************************************************************/ |
257 | 213 | ||
258 | #include "qgfxraster_qws.h" | 214 | #include "qgfxraster_qws.h" |
@@ -370,11 +326,115 @@ diff -ur qt-2.3.7_clean/src/kernel/qgfxvfb_qws.cpp qt-2.3.7/src/kernel/qgfxvfb_q | |||
370 | +qvfb_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) ); | 326 | +qvfb_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) ); |
371 | QGfxRaster<depth,type>::tiledBlt( x, y, w, h ); | 327 | QGfxRaster<depth,type>::tiledBlt( x, y, w, h ); |
372 | QWSDisplay::ungrab(); | 328 | QWSDisplay::ungrab(); |
373 | } | 329 | } |
374 | diff -ur qt-2.3.7_clean/src/tools/qcstring.h qt-2.3.7/src/tools/qcstring.h | 330 | diff -ur qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp qt-2.3.7/src/kernel/qgfxvnc_qws.cpp |
375 | --- qt-2.3.7_clean/src/tools/qcstring.h2004-06-04 02:17:53.000000000 +0200 | 331 | --- qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp2004-09-10 21:08:04.000000000 +0200 |
376 | +++ qt-2.3.7/src/tools/qcstring.h2004-06-04 02:24:25.000000000 +0200 | 332 | +++ qt-2.3.7/src/kernel/qgfxvnc_qws.cpp2004-09-10 21:10:54.000000000 +0200 |
333 | @@ -971,7 +971,7 @@ | ||
334 | void QGfxVNC<depth,type>::drawPoint( int x, int y ) | ||
335 | { | ||
336 | QWSDisplay::grab( TRUE ); | ||
337 | - qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) & clipbounds ); | ||
338 | + qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) & this->clipbounds ); | ||
339 | QGfxRaster<depth,type>::drawPoint( x, y ); | ||
340 | QWSDisplay::ungrab(); | ||
341 | } | ||
342 | @@ -981,8 +981,8 @@ | ||
343 | { | ||
344 | QWSDisplay::grab( TRUE ); | ||
345 | QRect r = pa.boundingRect(); | ||
346 | - r.moveBy( xoffs, yoffs ); | ||
347 | - qvnc_screen->setDirty( r & clipbounds ); | ||
348 | + r.moveBy( this->xoffs, this->yoffs ); | ||
349 | + qvnc_screen->setDirty( r & this->clipbounds ); | ||
350 | QGfxRaster<depth,type>::drawPoints( pa, x, y ); | ||
351 | QWSDisplay::ungrab(); | ||
352 | } | ||
353 | @@ -992,9 +992,9 @@ | ||
354 | { | ||
355 | QWSDisplay::grab( TRUE ); | ||
356 | QRect r; | ||
357 | - r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs ); | ||
358 | + r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs ); | ||
359 | r = r.normalize(); | ||
360 | - qvnc_screen->setDirty( r & clipbounds ); | ||
361 | + qvnc_screen->setDirty( r & this->clipbounds ); | ||
362 | QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 ); | ||
363 | QWSDisplay::ungrab(); | ||
364 | } | ||
365 | @@ -1003,7 +1003,7 @@ | ||
366 | void QGfxVNC<depth,type>::fillRect( int x,int y,int w,int h ) | ||
367 | { | ||
368 | QWSDisplay::grab( TRUE ); | ||
369 | - qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds ); | ||
370 | + qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds ); | ||
371 | QGfxRaster<depth,type>::fillRect( x, y, w, h ); | ||
372 | QWSDisplay::ungrab(); | ||
373 | } | ||
374 | @@ -1013,8 +1013,8 @@ | ||
375 | { | ||
376 | QWSDisplay::grab( TRUE ); | ||
377 | QRect r = pa.boundingRect(); | ||
378 | - r.moveBy( xoffs, yoffs ); | ||
379 | - qvnc_screen->setDirty( r & clipbounds ); | ||
380 | + r.moveBy( this->xoffs, this->yoffs ); | ||
381 | + qvnc_screen->setDirty( r & this->clipbounds ); | ||
382 | QGfxRaster<depth,type>::drawPolyline( pa, x, y ); | ||
383 | QWSDisplay::ungrab(); | ||
384 | } | ||
385 | @@ -1024,8 +1024,8 @@ | ||
386 | { | ||
387 | QWSDisplay::grab( TRUE ); | ||
388 | QRect r = pa.boundingRect(); | ||
389 | - r.moveBy( xoffs, yoffs ); | ||
390 | - qvnc_screen->setDirty( r & clipbounds ); | ||
391 | + r.moveBy( this->xoffs, this->yoffs ); | ||
392 | + qvnc_screen->setDirty( r & this->clipbounds ); | ||
393 | QGfxRaster<depth,type>::drawPolygon( pa, w, x, y ); | ||
394 | QWSDisplay::ungrab(); | ||
395 | } | ||
396 | @@ -1034,7 +1034,7 @@ | ||
397 | void QGfxVNC<depth,type>::blt( int x,int y,int w,int h, int sx, int sy ) | ||
398 | { | ||
399 | QWSDisplay::grab( TRUE ); | ||
400 | - qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds ); | ||
401 | + qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds ); | ||
402 | QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy ); | ||
403 | QWSDisplay::ungrab(); | ||
404 | } | ||
405 | @@ -1045,8 +1045,8 @@ | ||
406 | QWSDisplay::grab( TRUE ); | ||
407 | int dy = sy - y; | ||
408 | int dx = sx - x; | ||
409 | - qvnc_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs, | ||
410 | - w+abs(dx), h+abs(dy)) & clipbounds ); | ||
411 | + qvnc_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs, | ||
412 | + w+abs(dx), h+abs(dy)) & this->clipbounds ); | ||
413 | QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy ); | ||
414 | QWSDisplay::ungrab(); | ||
415 | } | ||
416 | @@ -1056,7 +1056,7 @@ | ||
417 | void QGfxVNC<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy ) | ||
418 | { | ||
419 | QWSDisplay::grab( TRUE ); | ||
420 | - qvnc_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) & clipbounds ); | ||
421 | + qvnc_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds ); | ||
422 | QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy ); | ||
423 | QWSDisplay::ungrab(); | ||
424 | } | ||
425 | @@ -1066,7 +1066,7 @@ | ||
426 | void QGfxVNC<depth,type>::tiledBlt( int x,int y,int w,int h ) | ||
427 | { | ||
428 | QWSDisplay::grab( TRUE ); | ||
429 | - qvnc_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) & clipbounds ); | ||
430 | + qvnc_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds ); | ||
431 | QGfxRaster<depth,type>::tiledBlt( x, y, w, h ); | ||
432 | QWSDisplay::ungrab(); | ||
433 | } | ||
434 | diff -ur qt-2.3.7_old/src/tools/qcstring.h qt-2.3.7/src/tools/qcstring.h | ||
435 | --- qt-2.3.7_old/src/tools/qcstring.h2004-09-10 21:08:04.000000000 +0200 | ||
436 | +++ qt-2.3.7/src/tools/qcstring.h2004-09-10 21:08:42.000000000 +0200 | ||
377 | @@ -119,7 +119,7 @@ | 437 | @@ -119,7 +119,7 @@ |
378 | // We want to keep source compatibility for 2.x | 438 | // We want to keep source compatibility for 2.x |
379 | // ### TODO for 4.0: completely remove these and the cstr* functions | 439 | // ### TODO for 4.0: completely remove these and the cstr* functions |
380 | 440 | ||
@@ -382,11 +442,11 @@ diff -ur qt-2.3.7_clean/src/tools/qcstring.h qt-2.3.7/src/tools/qcstring.h | |||
382 | +#if 0 | 442 | +#if 0 |
383 | 443 | ||
384 | #undefstrlen | 444 | #undefstrlen |
385 | #define strlen qstrlen | 445 | #define strlen qstrlen |
386 | diff -ur qt-2.3.7_clean/src/tools/qglobal.h qt-2.3.7/src/tools/qglobal.h | 446 | diff -ur qt-2.3.7_old/src/tools/qglobal.h qt-2.3.7/src/tools/qglobal.h |
387 | --- qt-2.3.7_clean/src/tools/qglobal.h2004-06-04 02:17:53.000000000 +0200 | 447 | --- qt-2.3.7_old/src/tools/qglobal.h2004-09-10 21:08:04.000000000 +0200 |
388 | +++ qt-2.3.7/src/tools/qglobal.h2004-06-04 02:29:41.000000000 +0200 | 448 | +++ qt-2.3.7/src/tools/qglobal.h2004-09-10 21:08:42.000000000 +0200 |
389 | @@ -207,8 +207,16 @@ | 449 | @@ -207,8 +207,16 @@ |
390 | #if __GNUC__ == 2 && __GNUC_MINOR__ == 96 | 450 | #if __GNUC__ == 2 && __GNUC_MINOR__ == 96 |
391 | #define Q_FP_CCAST_BROKEN | 451 | #define Q_FP_CCAST_BROKEN |
392 | #endif | 452 | #endif |
@@ -402,12 +462,11 @@ diff -ur qt-2.3.7_clean/src/tools/qglobal.h qt-2.3.7/src/tools/qglobal.h | |||
402 | +# endif | 462 | +# endif |
403 | #endif | 463 | #endif |
404 | #elif defined(__xlC__) | 464 | #elif defined(__xlC__) |
405 | #define _CC_XLC_ | 465 | #define _CC_XLC_ |
406 | Nur in qt-2.3.7/src/tools: qglobal.h~. | 466 | diff -ur qt-2.3.7_old/src/tools/qsortedlist.h qt-2.3.7/src/tools/qsortedlist.h |
407 | diff -ur qt-2.3.7_clean/src/tools/qsortedlist.h qt-2.3.7/src/tools/qsortedlist.h | 467 | --- qt-2.3.7_old/src/tools/qsortedlist.h2004-09-10 21:08:04.000000000 +0200 |
408 | --- qt-2.3.7_clean/src/tools/qsortedlist.h2004-06-04 02:17:53.000000000 +0200 | 468 | +++ qt-2.3.7/src/tools/qsortedlist.h2004-09-10 21:08:42.000000000 +0200 |
409 | +++ qt-2.3.7/src/tools/qsortedlist.h2004-06-04 02:24:25.000000000 +0200 | ||
410 | @@ -48,7 +48,7 @@ | 469 | @@ -48,7 +48,7 @@ |
411 | public: | 470 | public: |
412 | QSortedList() {} | 471 | QSortedList() {} |
413 | QSortedList( const QSortedList<type> &l ) : QList<type>(l) {} | 472 | QSortedList( const QSortedList<type> &l ) : QList<type>(l) {} |
@@ -415,11 +474,11 @@ diff -ur qt-2.3.7_clean/src/tools/qsortedlist.h qt-2.3.7/src/tools/qsortedlist.h | |||
415 | + ~QSortedList() { this->clear(); } | 474 | + ~QSortedList() { this->clear(); } |
416 | QSortedList<type> &operator=(const QSortedList<type> &l) | 475 | QSortedList<type> &operator=(const QSortedList<type> &l) |
417 | { return (QSortedList<type>&)QList<type>::operator=(l); } | 476 | { return (QSortedList<type>&)QList<type>::operator=(l); } |
418 | 477 | ||
419 | diff -ur qt-2.3.7_clean/src/tools/qstring.h qt-2.3.7/src/tools/qstring.h | 478 | diff -ur qt-2.3.7_old/src/tools/qstring.h qt-2.3.7/src/tools/qstring.h |
420 | --- qt-2.3.7_clean/src/tools/qstring.h2004-06-04 02:17:53.000000000 +0200 | 479 | --- qt-2.3.7_old/src/tools/qstring.h2004-09-10 21:08:04.000000000 +0200 |
421 | +++ qt-2.3.7/src/tools/qstring.h2004-06-04 02:54:16.000000000 +0200 | 480 | +++ qt-2.3.7/src/tools/qstring.h2004-09-10 21:08:42.000000000 +0200 |
422 | @@ -163,8 +163,16 @@ | 481 | @@ -163,8 +163,16 @@ |
423 | bool isLetterOrNumber() const; | 482 | bool isLetterOrNumber() const; |
424 | bool isDigit() const; | 483 | bool isDigit() const; |
425 | 484 | ||
@@ -436,5 +495,4 @@ diff -ur qt-2.3.7_clean/src/tools/qstring.h qt-2.3.7/src/tools/qstring.h | |||
436 | + | 495 | + |
437 | uchar cell() const { return cl; } | 496 | uchar cell() const { return cl; } |
438 | uchar row() const { return rw; } | 497 | uchar row() const { return rw; } |
439 | 498 | ||
440 | Nur in qt-2.3.7/src/tools: qstring.h~. | ||