-rw-r--r-- | qt/qt-2.3.7.patch/qte237-all.patch | 11 |
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 | |||
@@ -315,96 +315,107 @@ diff -ru qt-2.3.5_fresh/src/kernel/qgfxraster_qws.cpp qt-2.3.5/src/kernel/qgfxra | |||
315 | GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1)) | 315 | GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1)) |
316 | -#ifdef QWS_EXPERIMENTAL_FASTPATH | 316 | -#ifdef QWS_EXPERIMENTAL_FASTPATH |
317 | +#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !! | 317 | +#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !! |
318 | // ### fix for 8bpp | 318 | // ### fix for 8bpp |
319 | // This seems to be reliable now, at least for 16bpp | 319 | // This seems to be reliable now, at least for 16bpp |
320 | 320 | ||
321 | Nur in qt-2.3.5/src/kernel: qgfxraster_qws.cpp.orig. | 321 | Nur in qt-2.3.5/src/kernel: qgfxraster_qws.cpp.orig. |
322 | diff -ru qt-2.3.5_fresh/src/kernel/qwindowsystem_qws.cpp qt-2.3.5/src/kernel/qwindowsystem_qws.cpp | 322 | diff -ru qt-2.3.5_fresh/src/kernel/qwindowsystem_qws.cpp qt-2.3.5/src/kernel/qwindowsystem_qws.cpp |
323 | --- qt-2.3.5_fresh/src/kernel/qwindowsystem_qws.cpp2003-05-13 15:56:11.000000000 +0200 | 323 | --- qt-2.3.5_fresh/src/kernel/qwindowsystem_qws.cpp2003-05-13 15:56:11.000000000 +0200 |
324 | +++ qt-2.3.5/src/kernel/qwindowsystem_qws.cpp2003-05-13 15:58:19.000000000 +0200 | 324 | +++ qt-2.3.5/src/kernel/qwindowsystem_qws.cpp2003-05-13 15:58:19.000000000 +0200 |
325 | @@ -843,6 +843,18 @@ | 325 | @@ -843,6 +843,18 @@ |
326 | { | 326 | { |
327 | } | 327 | } |
328 | 328 | ||
329 | +static void catchSegvSignal( int ) | 329 | +static void catchSegvSignal( int ) |
330 | +{ | 330 | +{ |
331 | +#ifndef QT_NO_QWS_KEYBOARD | 331 | +#ifndef QT_NO_QWS_KEYBOARD |
332 | + if ( qwsServer ) | 332 | + if ( qwsServer ) |
333 | +qwsServer->closeKeyboard(); | 333 | +qwsServer->closeKeyboard(); |
334 | +#endif | 334 | +#endif |
335 | + QWSServer::closedown(); | 335 | + QWSServer::closedown(); |
336 | + fprintf(stderr, "Segmentation fault.\n"); | 336 | + fprintf(stderr, "Segmentation fault.\n"); |
337 | + exit(1); | 337 | + exit(1); |
338 | +} | 338 | +} |
339 | + | 339 | + |
340 | + | 340 | + |
341 | /*! | 341 | /*! |
342 | \class QWSServer qwindowsystem_qws.h | 342 | \class QWSServer qwindowsystem_qws.h |
343 | \brief Server-specific functionality in Qt/Embedded | 343 | \brief Server-specific functionality in Qt/Embedded |
344 | @@ -912,6 +924,7 @@ | 344 | @@ -912,6 +924,7 @@ |
345 | } | 345 | } |
346 | 346 | ||
347 | signal(SIGPIPE, ignoreSignal); //we get it when we read | 347 | signal(SIGPIPE, ignoreSignal); //we get it when we read |
348 | + signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash | 348 | + signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash |
349 | #endif | 349 | #endif |
350 | focusw = 0; | 350 | focusw = 0; |
351 | mouseGrabber = 0; | 351 | mouseGrabber = 0; |
352 | diff -ru qt-2.3.5_fresh/src/widgets/qcommonstyle.cpp qt-2.3.5/src/widgets/qcommonstyle.cpp | 352 | diff -ru qt-2.3.5_fresh/src/widgets/qcommonstyle.cpp qt-2.3.5/src/widgets/qcommonstyle.cpp |
353 | --- qt-2.3.5_fresh/src/widgets/qcommonstyle.cpp2003-05-13 15:56:12.000000000 +0200 | 353 | --- qt-2.3.5_fresh/src/widgets/qcommonstyle.cpp2003-05-13 15:56:12.000000000 +0200 |
354 | +++ qt-2.3.5/src/widgets/qcommonstyle.cpp2003-05-13 15:58:19.000000000 +0200 | 354 | +++ qt-2.3.5/src/widgets/qcommonstyle.cpp2003-05-13 15:58:19.000000000 +0200 |
355 | @@ -566,7 +566,7 @@ | 355 | @@ -566,7 +566,7 @@ |
356 | bool enabled, bool active ) | 356 | bool enabled, bool active ) |
357 | { | 357 | { |
358 | #ifndef QT_NO_MENUBAR | 358 | #ifndef QT_NO_MENUBAR |
359 | -#ifndef QT_NO_STYLE_SGI | 359 | -#ifndef QT_NO_STYLE_SGI |
360 | +#if 1 // #ifndef QT_NO_STYLE_SGI | 360 | +#if 1 // #ifndef QT_NO_STYLE_SGI |
361 | if (draw_menu_bar_impl != 0) { | 361 | if (draw_menu_bar_impl != 0) { |
362 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; | 362 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; |
363 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); | 363 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); |
364 | Nur in qt-2.3.5/src/widgets: qcommonstyle.cpp.orig. | 364 | Nur in qt-2.3.5/src/widgets: qcommonstyle.cpp.orig. |
365 | diff -ru qt-2.3.5_fresh/src/widgets/qlistview.cpp qt-2.3.5/src/widgets/qlistview.cpp | 365 | diff -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 ); |
381 | diff -ru qt-2.3.5_fresh/src/widgets/qtoolbutton.cpp qt-2.3.5/src/widgets/qtoolbutton.cpp | 381 | diff -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 | ||