summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qt-2.3.7.patch/qte237-all.patch12
-rw-r--r--qt/qt-2.3.7.patch/qte237-gcc34.patch12
2 files changed, 24 insertions, 0 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-all.patch b/qt/qt-2.3.7.patch/qte237-all.patch
index ea03446..307e558 100644
--- a/qt/qt-2.3.7.patch/qte237-all.patch
+++ b/qt/qt-2.3.7.patch/qte237-all.patch
@@ -1436,16 +1436,28 @@ diff -ur qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp qt-2.3.7/src/kernel/qgfxvnc_qws
1436 { 1436 {
1437 QWSDisplay::grab( TRUE ); 1437 QWSDisplay::grab( TRUE );
1438- qvnc_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) & clipbounds ); 1438- qvnc_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) & clipbounds );
1439+ qvnc_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds ); 1439+ qvnc_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds );
1440 QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy ); 1440 QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy );
1441 QWSDisplay::ungrab(); 1441 QWSDisplay::ungrab();
1442 } 1442 }
1443@@ -1066,7 +1066,7 @@ 1443@@ -1066,7 +1066,7 @@
1444 void QGfxVNC<depth,type>::tiledBlt( int x,int y,int w,int h ) 1444 void QGfxVNC<depth,type>::tiledBlt( int x,int y,int w,int h )
1445 { 1445 {
1446 QWSDisplay::grab( TRUE ); 1446 QWSDisplay::grab( TRUE );
1447- qvnc_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) & clipbounds ); 1447- qvnc_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) & clipbounds );
1448+ qvnc_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds ); 1448+ qvnc_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds );
1449 QGfxRaster<depth,type>::tiledBlt( x, y, w, h ); 1449 QGfxRaster<depth,type>::tiledBlt( x, y, w, h );
1450 QWSDisplay::ungrab(); 1450 QWSDisplay::ungrab();
1451 } 1451 }
1452diff -ur qt-2.3.7_old/src/kernel/qwsdecoration_qws.h qt-2.3.7/src/kernel/qwsdecoration_qws.h
1453 --- qt-2.3.7_old/src/kernel/qwsdecoration_qws.h2003-07-17 03:20:26.000000000 +0200
1454 +++ qt-2.3.7/src/kernel/qwsdecoration_qws.h2004-09-13 15:44:13.000000000 +0200
1455@@ -50,7 +50,7 @@
1456 enum Region { None=0, All=1, Title=2, Top=3, Bottom=4, Left=5, Right=6,
1457 TopLeft=7, TopRight=8, BottomLeft=9, BottomRight=10,
1458 Close=11, Minimize=12, Maximize=13, Normalize=14,
1459 - Menu=15, LastRegion=Menu };
1460 + Menu=15, LastRegion=Menu, UserDefined = 100 };
1461
1462 virtual QRegion region(const QWidget *, const QRect &rect, Region r=All) = 0;
1463 virtual void close( QWidget * );
diff --git a/qt/qt-2.3.7.patch/qte237-gcc34.patch b/qt/qt-2.3.7.patch/qte237-gcc34.patch
index 9a0f28c..a7f1681 100644
--- a/qt/qt-2.3.7.patch/qte237-gcc34.patch
+++ b/qt/qt-2.3.7.patch/qte237-gcc34.patch
@@ -483,16 +483,28 @@ diff -ur qt-2.3.7_old/src/tools/qstring.h qt-2.3.7/src/tools/qstring.h
483 bool isDigit() const; 483 bool isDigit() const;
484 484
485+ 485+
486+#ifdef Q_NO_PACKED_REFERENCE 486+#ifdef Q_NO_PACKED_REFERENCE
487+ uchar& cell() { return *(&cl); } 487+ uchar& cell() { return *(&cl); }
488+ uchar& row() { return *(&rw); } 488+ uchar& row() { return *(&rw); }
489+#else 489+#else
490 uchar& cell() { return cl; } 490 uchar& cell() { return cl; }
491- uchar& row() { return rw; } 491- uchar& row() { return rw; }
492+ uchar& row() { return rw; } 492+ uchar& row() { return rw; }
493+#endif 493+#endif
494+ 494+
495+ 495+
496 uchar cell() const { return cl; } 496 uchar cell() const { return cl; }
497 uchar row() const { return rw; } 497 uchar row() const { return rw; }
498 498
499diff -ur qt-2.3.7_old/src/kernel/qwsdecoration_qws.h qt-2.3.7/src/kernel/qwsdecoration_qws.h
500 --- qt-2.3.7_old/src/kernel/qwsdecoration_qws.h2003-07-17 03:20:26.000000000 +0200
501 +++ qt-2.3.7/src/kernel/qwsdecoration_qws.h2004-09-13 15:44:13.000000000 +0200
502@@ -50,7 +50,7 @@
503 enum Region { None=0, All=1, Title=2, Top=3, Bottom=4, Left=5, Right=6,
504 TopLeft=7, TopRight=8, BottomLeft=9, BottomRight=10,
505 Close=11, Minimize=12, Maximize=13, Normalize=14,
506 - Menu=15, LastRegion=Menu };
507 + Menu=15, LastRegion=Menu, UserDefined = 100 };
508
509 virtual QRegion region(const QWidget *, const QRect &rect, Region r=All) = 0;
510 virtual void close( QWidget * );