-rw-r--r-- | qt/qt-2.3.7.patch/qte237-all.patch | 151 |
1 files changed, 151 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 e6cf0a4..cb09109 100644 --- a/qt/qt-2.3.7.patch/qte237-all.patch +++ b/qt/qt-2.3.7.patch/qte237-all.patch | |||
@@ -390,32 +390,183 @@ diff -ru qt-2.3.5_fresh/src/widgets/qtoolbutton.cpp qt-2.3.5/src/widgets/qtoolbu | |||
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 | 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 | 412 | +++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp2003-12-07 15:54:10.000000000 -0800 |
413 | @@ -238,7 +238,7 @@ | 413 | @@ -238,7 +238,7 @@ |
414 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 63 | 414 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 63 |
415 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 64 | 415 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 64 |
416 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 65 | 416 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 65 |
417 | - { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 66 | 417 | - { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 66 |
418 | + { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 | 418 | + { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 |
419 | { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 | 419 | { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 |
420 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 68 | 420 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 68 |
421 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 69 | 421 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 69 |
422 | diff -ru qt-2.3.7/configs/linux-generic-g++-shared qte/configs/linux-generic-g++-shared | ||
423 | --- qt-2.3.7/configs/linux-generic-g++-shared2003-07-17 03:23:08.000000000 +0200 | ||
424 | +++ qte/configs/linux-generic-g++-shared2004-03-01 20:08:00.884254576 +0100 | ||
425 | @@ -36,7 +36,7 @@ | ||
426 | SYSCONF_LIBS_YACC= | ||
427 | |||
428 | # Linking applications | ||
429 | -SYSCONF_LINK = gcc | ||
430 | +SYSCONF_LINK = g++ | ||
431 | SYSCONF_LFLAGS = | ||
432 | SYSCONF_LIBS = | ||
433 | |||
434 | Nur in qte/configs: linux-generic-g++-shared~. | ||
435 | diff -ru qt-2.3.7/configs/linux-generic-g++-shared-debug qte/configs/linux-generic-g++-shared-debug | ||
436 | --- qt-2.3.7/configs/linux-generic-g++-shared-debug2003-07-17 03:23:08.000000000 +0200 | ||
437 | +++ qte/configs/linux-generic-g++-shared-debug2004-03-01 20:08:06.552392888 +0100 | ||
438 | @@ -36,7 +36,7 @@ | ||
439 | SYSCONF_LIBS_YACC= | ||
440 | |||
441 | # Linking applications | ||
442 | -SYSCONF_LINK = gcc | ||
443 | +SYSCONF_LINK = g++ | ||
444 | SYSCONF_LFLAGS = | ||
445 | SYSCONF_LIBS = | ||
446 | |||
447 | Nur in qte/configs: linux-generic-g++-shared-debug~. | ||
448 | diff -ru qt-2.3.7/configs/linux-generic-g++-static qte/configs/linux-generic-g++-static | ||
449 | --- qt-2.3.7/configs/linux-generic-g++-static2003-07-17 03:23:08.000000000 +0200 | ||
450 | +++ qte/configs/linux-generic-g++-static2004-03-01 20:08:11.410654320 +0100 | ||
451 | @@ -36,7 +36,7 @@ | ||
452 | SYSCONF_LIBS_YACC= | ||
453 | |||
454 | # Linking applications | ||
455 | -SYSCONF_LINK = gcc | ||
456 | +SYSCONF_LINK = g++ | ||
457 | SYSCONF_LFLAGS = | ||
458 | SYSCONF_LIBS = | ||
459 | |||
460 | Nur in qte/configs: linux-generic-g++-static~. | ||
461 | diff -ru qt-2.3.7/configs/linux-generic-g++-static-debug qte/configs/linux-generic-g++-static-debug | ||
462 | --- qt-2.3.7/configs/linux-generic-g++-static-debug2003-07-17 03:23:08.000000000 +0200 | ||
463 | +++ qte/configs/linux-generic-g++-static-debug2004-03-01 20:08:15.780989928 +0100 | ||
464 | @@ -36,7 +36,7 @@ | ||
465 | SYSCONF_LIBS_YACC= | ||
466 | |||
467 | # Linking applications | ||
468 | -SYSCONF_LINK = gcc | ||
469 | +SYSCONF_LINK = g++ | ||
470 | SYSCONF_LFLAGS = | ||
471 | SYSCONF_LIBS = | ||
472 | |||
473 | Nur in qte/configs: linux-generic-g++-static-debug~. | ||
474 | diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-shared qte/configs/linux-generic_rtti-g++-shared | ||
475 | --- qt-2.3.7/configs/linux-generic_rtti-g++-shared2003-07-17 03:23:08.000000000 +0200 | ||
476 | +++ qte/configs/linux-generic_rtti-g++-shared2004-03-01 20:08:20.393288752 +0100 | ||
477 | @@ -36,7 +36,7 @@ | ||
478 | SYSCONF_LIBS_YACC= | ||
479 | |||
480 | # Linking applications | ||
481 | -SYSCONF_LINK = gcc | ||
482 | +SYSCONF_LINK = g++ | ||
483 | SYSCONF_LFLAGS = | ||
484 | SYSCONF_LIBS = | ||
485 | |||
486 | Nur in qte/configs: linux-generic_rtti-g++-shared~. | ||
487 | diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug qte/configs/linux-generic_rtti-g++-shared-debug | ||
488 | --- qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug2003-07-17 03:23:08.000000000 +0200 | ||
489 | +++ qte/configs/linux-generic_rtti-g++-shared-debug2004-03-01 20:08:25.127569032 +0100 | ||
490 | @@ -36,7 +36,7 @@ | ||
491 | SYSCONF_LIBS_YACC= | ||
492 | |||
493 | # Linking applications | ||
494 | -SYSCONF_LINK = gcc | ||
495 | +SYSCONF_LINK = g++ | ||
496 | SYSCONF_LFLAGS = | ||
497 | SYSCONF_LIBS = | ||
498 | |||
499 | Nur in qte/configs: linux-generic_rtti-g++-shared-debug~. | ||
500 | diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-static qte/configs/linux-generic_rtti-g++-static | ||
501 | --- qt-2.3.7/configs/linux-generic_rtti-g++-static2003-07-17 03:23:08.000000000 +0200 | ||
502 | +++ qte/configs/linux-generic_rtti-g++-static2004-03-01 20:08:29.727869680 +0100 | ||
503 | @@ -36,7 +36,7 @@ | ||
504 | SYSCONF_LIBS_YACC= | ||
505 | |||
506 | # Linking applications | ||
507 | -SYSCONF_LINK = gcc | ||
508 | +SYSCONF_LINK = g++ | ||
509 | SYSCONF_LFLAGS = | ||
510 | SYSCONF_LIBS = | ||
511 | |||
512 | Nur in qte/configs: linux-generic_rtti-g++-static~. | ||
513 | diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-static-debug qte/configs/linux-generic_rtti-g++-static-debug | ||
514 | --- qt-2.3.7/configs/linux-generic_rtti-g++-static-debug2003-07-17 03:23:08.000000000 +0200 | ||
515 | +++ qte/configs/linux-generic_rtti-g++-static-debug2004-03-01 20:06:12.806684864 +0100 | ||
516 | @@ -36,7 +36,7 @@ | ||
517 | SYSCONF_LIBS_YACC= | ||
518 | |||
519 | # Linking applications | ||
520 | -SYSCONF_LINK = gcc | ||
521 | +SYSCONF_LINK = g++ | ||
522 | SYSCONF_LFLAGS = | ||
523 | SYSCONF_LIBS = | ||
524 | |||
525 | Nur in qte/configs: linux-generic_rtti-g++-static-debug~. | ||
526 | diff -ru qt-2.3.7/configs/linux-x86rtti-g++-shared qte/configs/linux-x86rtti-g++-shared | ||
527 | --- qt-2.3.7/configs/linux-x86rtti-g++-shared2003-07-17 03:23:10.000000000 +0200 | ||
528 | +++ qte/configs/linux-x86rtti-g++-shared2004-03-01 19:54:16.977507440 +0100 | ||
529 | @@ -36,7 +36,7 @@ | ||
530 | SYSCONF_LIBS_YACC= | ||
531 | |||
532 | # Linking applications | ||
533 | -SYSCONF_LINK = gcc | ||
534 | +SYSCONF_LINK = g++ | ||
535 | SYSCONF_LFLAGS = | ||
536 | SYSCONF_LIBS = -lm | ||
537 | |||
538 | diff -ru qt-2.3.7/configs/linux-x86rtti-g++-shared-debug qte/configs/linux-x86rtti-g++-shared-debug | ||
539 | --- qt-2.3.7/configs/linux-x86rtti-g++-shared-debug2003-07-17 03:23:10.000000000 +0200 | ||
540 | +++ qte/configs/linux-x86rtti-g++-shared-debug2004-03-01 19:54:24.064430064 +0100 | ||
541 | @@ -36,7 +36,7 @@ | ||
542 | SYSCONF_LIBS_YACC= | ||
543 | |||
544 | # Linking applications | ||
545 | -SYSCONF_LINK = gcc | ||
546 | +SYSCONF_LINK = g++ | ||
547 | SYSCONF_LFLAGS = | ||
548 | SYSCONF_LIBS = -lm | ||
549 | |||
550 | diff -ru qt-2.3.7/configs/linux-x86rtti-g++-static qte/configs/linux-x86rtti-g++-static | ||
551 | --- qt-2.3.7/configs/linux-x86rtti-g++-static2003-07-17 03:23:10.000000000 +0200 | ||
552 | +++ qte/configs/linux-x86rtti-g++-static2004-03-01 19:54:32.020220600 +0100 | ||
553 | @@ -36,7 +36,7 @@ | ||
554 | SYSCONF_LIBS_YACC= | ||
555 | |||
556 | # Linking applications | ||
557 | -SYSCONF_LINK = gcc | ||
558 | +SYSCONF_LINK = g++ | ||
559 | SYSCONF_LFLAGS = | ||
560 | SYSCONF_LIBS = -lm | ||
561 | |||
562 | diff -ru qt-2.3.7/configs/linux-x86rtti-g++-static-debug qte/configs/linux-x86rtti-g++-static-debug | ||
563 | --- qt-2.3.7/configs/linux-x86rtti-g++-static-debug2003-07-17 03:23:10.000000000 +0200 | ||
564 | +++ qte/configs/linux-x86rtti-g++-static-debug2004-03-01 19:54:41.434789368 +0100 | ||
565 | @@ -36,7 +36,7 @@ | ||
566 | SYSCONF_LIBS_YACC= | ||
567 | |||
568 | # Linking applications | ||
569 | -SYSCONF_LINK = gcc | ||
570 | +SYSCONF_LINK = g++ | ||
571 | SYSCONF_LFLAGS = | ||
572 | SYSCONF_LIBS = -lm | ||