author | mickeyl <mickeyl> | 2005-02-19 16:07:58 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-02-19 16:07:58 (UTC) |
commit | b7bf9c7acdc010eb30bc246372efb0d1b394166a (patch) (unidiff) | |
tree | 8dde116603cd8ddf439a881fc4a1d8f413af617b /qt/qt-2.3.10.patch/handhelds.patch | |
parent | 298d0d244ca724405ca0651775ed61a22ce7a5ae (diff) | |
download | opie-b7bf9c7acdc010eb30bc246372efb0d1b394166a.zip opie-b7bf9c7acdc010eb30bc246372efb0d1b394166a.tar.gz opie-b7bf9c7acdc010eb30bc246372efb0d1b394166a.tar.bz2 |
hello qte2.3.10 patches
bye bye old patches
Diffstat (limited to 'qt/qt-2.3.10.patch/handhelds.patch') (more/less context) (ignore whitespace changes)
-rw-r--r-- | qt/qt-2.3.10.patch/handhelds.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/qt/qt-2.3.10.patch/handhelds.patch b/qt/qt-2.3.10.patch/handhelds.patch new file mode 100644 index 0000000..3335796 --- a/dev/null +++ b/qt/qt-2.3.10.patch/handhelds.patch | |||
@@ -0,0 +1,80 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
4 | # | ||
5 | |||
6 | --- qt-2.3.10-snapshot-20050131/src/widgets/qcommonstyle.cpp~opie | ||
7 | +++ qt-2.3.10-snapshot-20050131/src/widgets/qcommonstyle.cpp | ||
8 | @@ -572,7 +572,7 @@ | ||
9 | bool enabled, bool active ) | ||
10 | { | ||
11 | #ifndef QT_NO_MENUBAR | ||
12 | -#ifndef QT_NO_STYLE_SGI | ||
13 | +#if 1 // #ifndef QT_NO_STYLE_SGI | ||
14 | if (draw_menu_bar_impl != 0) { | ||
15 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; | ||
16 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); | ||
17 | --- qt-2.3.10-snapshot-20050131/src/widgets/qlistview.cpp~opie | ||
18 | +++ qt-2.3.10-snapshot-20050131/src/widgets/qlistview.cpp | ||
19 | @@ -5051,9 +5051,9 @@ | ||
20 | l = l->childItem ? l->childItem : l->siblingItem; | ||
21 | |||
22 | if ( l && l->height() ) | ||
23 | -s.setHeight( s.height() + 10 * l->height() ); | ||
24 | - else | ||
25 | -s.setHeight( s.height() + 140 ); | ||
26 | +s.setHeight( s.height() + 4 /*10*/ * l->height() ); | ||
27 | + else // ^v much too big for handhelds | ||
28 | +s.setHeight( s.height() + 30 /*140*/ ); | ||
29 | |||
30 | if ( s.width() > s.height() * 3 ) | ||
31 | s.setHeight( s.width() / 3 ); | ||
32 | --- qt-2.3.10-snapshot-20050131/src/kernel/qwindowsystem_qws.cpp~opie | ||
33 | +++ qt-2.3.10-snapshot-20050131/src/kernel/qwindowsystem_qws.cpp | ||
34 | @@ -918,6 +918,18 @@ | ||
35 | { | ||
36 | } | ||
37 | |||
38 | +static void catchSegvSignal( int ) | ||
39 | +{ | ||
40 | +#ifndef QT_NO_QWS_KEYBOARD | ||
41 | + if ( qwsServer ) | ||
42 | +qwsServer->closeKeyboard(); | ||
43 | +#endif | ||
44 | + QWSServer::closedown(); | ||
45 | + fprintf(stderr, "Segmentation fault.\n"); | ||
46 | + exit(1); | ||
47 | +} | ||
48 | + | ||
49 | + | ||
50 | /*! | ||
51 | \class QWSServer qwindowsystem_qws.h | ||
52 | \brief Server-specific functionality in Qt/Embedded | ||
53 | @@ -1043,6 +1055,7 @@ | ||
54 | } | ||
55 | |||
56 | signal(SIGPIPE, ignoreSignal); //we get it when we read | ||
57 | + signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash | ||
58 | #endif | ||
59 | focusw = 0; | ||
60 | mouseGrabber = 0; | ||
61 | --- qt-2.3.10-snapshot-20050131/src/widgets/qtoolbutton.cpp~opie | ||
62 | +++ qt-2.3.10-snapshot-20050131/src/widgets/qtoolbutton.cpp | ||
63 | @@ -332,12 +332,12 @@ | ||
64 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); | ||
65 | w = pm.width(); | ||
66 | h = pm.height(); | ||
67 | -if ( w < 32 ) | ||
68 | - w = 32; | ||
69 | -if ( h < 32 ) | ||
70 | - h = 32; | ||
71 | +if ( w < 24 ) | ||
72 | + w = 24; | ||
73 | +if ( h < 24 ) | ||
74 | + h = 24; | ||
75 | } else { | ||
76 | -w = h = 16; | ||
77 | +w = h = 14; | ||
78 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); | ||
79 | w = pm.width(); | ||
80 | h = pm.height(); | ||