summaryrefslogtreecommitdiff
path: root/qt/qt-2.3.7.patch
Unidiff
Diffstat (limited to 'qt/qt-2.3.7.patch') (more/less context) (show whitespace changes)
-rw-r--r--qt/qt-2.3.7.patch/qte237-all.patch11
1 files changed, 11 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 233996a..e6cf0a4 100644
--- a/qt/qt-2.3.7.patch/qte237-all.patch
+++ b/qt/qt-2.3.7.patch/qte237-all.patch
@@ -363,48 +363,59 @@ diff -ru qt-2.3.5_fresh/src/widgets/qcommonstyle.cpp qt-2.3.5/src/widgets/qcommo
363 (this->*impl)(p, x, y, w, h, mi, g, enabled, active); 363 (this->*impl)(p, x, y, w, h, mi, g, enabled, active);
364Nur in qt-2.3.5/src/widgets: qcommonstyle.cpp.orig. 364Nur in qt-2.3.5/src/widgets: qcommonstyle.cpp.orig.
365diff -ru qt-2.3.5_fresh/src/widgets/qlistview.cpp qt-2.3.5/src/widgets/qlistview.cpp 365diff -ru qt-2.3.5_fresh/src/widgets/qlistview.cpp qt-2.3.5/src/widgets/qlistview.cpp
366 --- qt-2.3.5_fresh/src/widgets/qlistview.cpp2003-05-13 15:56:12.000000000 +0200 366 --- qt-2.3.5_fresh/src/widgets/qlistview.cpp2003-05-13 15:56:12.000000000 +0200
367 +++ qt-2.3.5/src/widgets/qlistview.cpp2003-05-13 15:58:18.000000000 +0200 367 +++ qt-2.3.5/src/widgets/qlistview.cpp2003-05-13 15:58:18.000000000 +0200
368@@ -4968,9 +4968,9 @@ 368@@ -4968,9 +4968,9 @@
369 l = l->childItem ? l->childItem : l->siblingItem; 369 l = l->childItem ? l->childItem : l->siblingItem;
370 370
371 if ( l && l->height() ) 371 if ( l && l->height() )
372 -s.setHeight( s.height() + 10 * l->height() ); 372 -s.setHeight( s.height() + 10 * l->height() );
373- else 373- else
374 -s.setHeight( s.height() + 140 ); 374 -s.setHeight( s.height() + 140 );
375 +s.setHeight( s.height() + 4 /*10*/ * l->height() ); 375 +s.setHeight( s.height() + 4 /*10*/ * l->height() );
376+ else // ^v much too big for handhelds 376+ else // ^v much too big for handhelds
377 +s.setHeight( s.height() + 30 /*140*/ ); 377 +s.setHeight( s.height() + 30 /*140*/ );
378 378
379 if ( s.width() > s.height() * 3 ) 379 if ( s.width() > s.height() * 3 )
380 s.setHeight( s.width() / 3 ); 380 s.setHeight( s.width() / 3 );
381diff -ru qt-2.3.5_fresh/src/widgets/qtoolbutton.cpp qt-2.3.5/src/widgets/qtoolbutton.cpp 381diff -ru qt-2.3.5_fresh/src/widgets/qtoolbutton.cpp qt-2.3.5/src/widgets/qtoolbutton.cpp
382 --- qt-2.3.5_fresh/src/widgets/qtoolbutton.cpp2003-05-13 15:56:12.000000000 +0200 382 --- qt-2.3.5_fresh/src/widgets/qtoolbutton.cpp2003-05-13 15:56:12.000000000 +0200
383 +++ qt-2.3.5/src/widgets/qtoolbutton.cpp2003-05-13 15:58:18.000000000 +0200 383 +++ qt-2.3.5/src/widgets/qtoolbutton.cpp2003-05-13 15:58:18.000000000 +0200
384@@ -230,7 +230,7 @@ 384@@ -230,7 +230,7 @@
385 else 385 else
386 QToolTip::add( this, textLabel ); 386 QToolTip::add( this, textLabel );
387 } 387 }
388 -#endif 388 -#endif
389+#endif 389+#endif
390 } 390 }
391 391
392 392
393@@ -324,12 +324,12 @@ 393@@ -324,12 +324,12 @@
394 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); 394 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal);
395 w = pm.width(); 395 w = pm.width();
396 h = pm.height(); 396 h = pm.height();
397 -if ( w < 32 ) 397 -if ( w < 32 )
398 - w = 32; 398 - w = 32;
399 -if ( h < 32 ) 399 -if ( h < 32 )
400 - h = 32; 400 - h = 32;
401 +if ( w < 24 ) 401 +if ( w < 24 )
402 + w = 24; 402 + w = 24;
403 +if ( h < 24 ) 403 +if ( h < 24 )
404 + h = 24; 404 + h = 24;
405 } else { 405 } else {
406 -w = h = 16; 406 -w = h = 16;
407 +w = h = 14; 407 +w = h = 14;
408 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); 408 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal);
409 w = pm.width(); 409 w = pm.width();
410 h = pm.height(); 410 h = pm.height();
411 --- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~c7xxrotate2003-07-16 18:20:25.000000000 -0700
412 +++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp2003-12-07 15:54:10.000000000 -0800
413@@ -238,7 +238,7 @@
414 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 63
415 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 64
416 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 65
417 - { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 66
418+ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66
419 { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67
420 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 68
421 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 69