| author | zecke <zecke> | 2004-09-13 14:06:48 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-09-13 14:06:48 (UTC) |
| commit | 2e896a0d3d5b18a160c5cc468bee5ed129a92320 (patch) (unidiff) | |
| tree | d1b502c78c744911d2bace64c09ca4fa69dc4c77 /qt | |
| parent | 5880f51e9d6a4ad2c670f7679e874fc0610d850a (diff) | |
| download | opie-2e896a0d3d5b18a160c5cc468bee5ed129a92320.zip opie-2e896a0d3d5b18a160c5cc468bee5ed129a92320.tar.gz opie-2e896a0d3d5b18a160c5cc468bee5ed129a92320.tar.bz2 | |
GCC 3.4.2 is so standard conform that it forces the range
of enumns. This broke handling of the 'Help' button in
our decoration. What we do now is to make the 'range'
bigger so that our 'Help'-Button will fit into the range.
| -rw-r--r-- | qt/qt-2.3.7.patch/qte237-all.patch | 12 | ||||
| -rw-r--r-- | qt/qt-2.3.7.patch/qte237-gcc34.patch | 12 |
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 | |||
| @@ -1449,3 +1449,15 @@ diff -ur qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp qt-2.3.7/src/kernel/qgfxvnc_qws | |||
| 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 | } |
| 1452 | diff -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 | |||
| @@ -496,3 +496,15 @@ diff -ur qt-2.3.7_old/src/tools/qstring.h qt-2.3.7/src/tools/qstring.h | |||
| 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 | ||
| 499 | diff -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 * ); | ||