Diffstat (limited to 'qt/qt-2.3.10.patch/qte-2.3.10-all.patch') (more/less context) (show whitespace changes)
-rw-r--r-- | qt/qt-2.3.10.patch/qte-2.3.10-all.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/qt/qt-2.3.10.patch/qte-2.3.10-all.patch b/qt/qt-2.3.10.patch/qte-2.3.10-all.patch index ab52716..24bac51 100644 --- a/qt/qt-2.3.10.patch/qte-2.3.10-all.patch +++ b/qt/qt-2.3.10.patch/qte-2.3.10-all.patch | |||
@@ -245,48 +245,83 @@ Index: qt-2.3.10/src/widgets/qcommonstyle.cpp | |||
245 | @@ -572,7 +572,7 @@ | 245 | @@ -572,7 +572,7 @@ |
246 | bool enabled, bool active ) | 246 | bool enabled, bool active ) |
247 | { | 247 | { |
248 | #ifndef QT_NO_MENUBAR | 248 | #ifndef QT_NO_MENUBAR |
249 | -#ifndef QT_NO_STYLE_SGI | 249 | -#ifndef QT_NO_STYLE_SGI |
250 | +#if 1 // #ifndef QT_NO_STYLE_SGI | 250 | +#if 1 // #ifndef QT_NO_STYLE_SGI |
251 | if (draw_menu_bar_impl != 0) { | 251 | if (draw_menu_bar_impl != 0) { |
252 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; | 252 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; |
253 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); | 253 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); |
254 | Index: qt-2.3.10/src/widgets/qlistview.cpp | 254 | Index: qt-2.3.10/src/widgets/qlistview.cpp |
255 | =================================================================== | 255 | =================================================================== |
256 | --- qt-2.3.10.orig/src/widgets/qlistview.cpp2005-02-24 21:09:53.868560939 +0100 | 256 | --- qt-2.3.10.orig/src/widgets/qlistview.cpp2005-02-24 21:09:53.868560939 +0100 |
257 | +++ qt-2.3.10/src/widgets/qlistview.cpp2005-02-24 21:10:03.500179222 +0100 | 257 | +++ qt-2.3.10/src/widgets/qlistview.cpp2005-02-24 21:10:03.500179222 +0100 |
258 | @@ -5051,9 +5051,9 @@ | 258 | @@ -5051,9 +5051,9 @@ |
259 | l = l->childItem ? l->childItem : l->siblingItem; | 259 | l = l->childItem ? l->childItem : l->siblingItem; |
260 | 260 | ||
261 | if ( l && l->height() ) | 261 | if ( l && l->height() ) |
262 | -s.setHeight( s.height() + 10 * l->height() ); | 262 | -s.setHeight( s.height() + 10 * l->height() ); |
263 | - else | 263 | - else |
264 | -s.setHeight( s.height() + 140 ); | 264 | -s.setHeight( s.height() + 140 ); |
265 | +s.setHeight( s.height() + 4 /*10*/ * l->height() ); | 265 | +s.setHeight( s.height() + 4 /*10*/ * l->height() ); |
266 | + else // ^v much too big for handhelds | 266 | + else // ^v much too big for handhelds |
267 | +s.setHeight( s.height() + 30 /*140*/ ); | 267 | +s.setHeight( s.height() + 30 /*140*/ ); |
268 | 268 | ||
269 | if ( s.width() > s.height() * 3 ) | 269 | if ( s.width() > s.height() * 3 ) |
270 | s.setHeight( s.width() / 3 ); | 270 | s.setHeight( s.width() / 3 ); |
271 | Index: qt-2.3.10/src/widgets/qtoolbutton.cpp | 271 | Index: qt-2.3.10/src/widgets/qtoolbutton.cpp |
272 | =================================================================== | 272 | =================================================================== |
273 | --- qt-2.3.10.orig/src/widgets/qtoolbutton.cpp2005-02-24 21:09:53.868560939 +0100 | 273 | --- qt-2.3.10.orig/src/widgets/qtoolbutton.cpp2005-02-24 21:09:53.868560939 +0100 |
274 | +++ qt-2.3.10/src/widgets/qtoolbutton.cpp2005-02-24 21:10:03.524175756 +0100 | 274 | +++ qt-2.3.10/src/widgets/qtoolbutton.cpp2005-02-24 21:10:03.524175756 +0100 |
275 | @@ -332,12 +332,12 @@ | 275 | @@ -332,12 +332,12 @@ |
276 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); | 276 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); |
277 | w = pm.width(); | 277 | w = pm.width(); |
278 | h = pm.height(); | 278 | h = pm.height(); |
279 | -if ( w < 32 ) | 279 | -if ( w < 32 ) |
280 | - w = 32; | 280 | - w = 32; |
281 | -if ( h < 32 ) | 281 | -if ( h < 32 ) |
282 | - h = 32; | 282 | - h = 32; |
283 | +if ( w < 24 ) | 283 | +if ( w < 24 ) |
284 | + w = 24; | 284 | + w = 24; |
285 | +if ( h < 24 ) | 285 | +if ( h < 24 ) |
286 | + h = 24; | 286 | + h = 24; |
287 | } else { | 287 | } else { |
288 | -w = h = 16; | 288 | -w = h = 16; |
289 | +w = h = 14; | 289 | +w = h = 14; |
290 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); | 290 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); |
291 | w = pm.width(); | 291 | w = pm.width(); |
292 | h = pm.height(); | 292 | h = pm.height(); |
293 | Index: qt-2.3.10/src/widgets/qtabbar.cpp | ||
294 | =================================================================== | ||
295 | --- qt-2.3.10.orig/src/widgets/qtabbar.cpp2005-02-27 18:07:41.000000000 -0600 | ||
296 | +++ qt-2.3.10/src/widgets/qtabbar.cpp2005-02-28 11:16:56.444377440 -0600 | ||
297 | @@ -260,7 +260,6 @@ | ||
298 | lstatic->insert( index, newTab ); | ||
299 | |||
300 | layoutTabs(); | ||
301 | - updateArrowButtons(); | ||
302 | makeVisible( tab( currentTab() ) ); | ||
303 | |||
304 | #ifndef QT_NO_ACCEL | ||
305 | @@ -282,7 +281,6 @@ | ||
306 | l->remove( t ); | ||
307 | lstatic->remove( t ); | ||
308 | layoutTabs(); | ||
309 | - updateArrowButtons(); | ||
310 | makeVisible( tab( currentTab() ) ); | ||
311 | update(); | ||
312 | } | ||
313 | @@ -887,6 +885,7 @@ | ||
314 | } | ||
315 | for ( t = lstatic->first(); t; t = lstatic->next() ) | ||
316 | t->r.setHeight( r.height() ); | ||
317 | + updateArrowButtons(); | ||
318 | } | ||
319 | |||
320 | /*! | ||
321 | @@ -977,7 +976,6 @@ | ||
322 | d->leftB->setGeometry( width() - 2*arrowWidth, 0, arrowWidth, height() ); | ||
323 | #endif | ||
324 | layoutTabs(); | ||
325 | - updateArrowButtons(); | ||
326 | makeVisible( tab( currentTab() )); | ||
327 | } | ||