Diffstat (limited to 'qt/qt-2.3.10.patch/qte-2.3.10-all.patch') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | qt/qt-2.3.10.patch/qte-2.3.10-all.patch | 63 |
1 files changed, 49 insertions, 14 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 @@ -36,5 +36,5 @@ Index: qt-2.3.10/src/iconview/qiconview.cpp @@ -2882,6 +2886,48 @@ } - + /*! + This function grabs all paintevents that otherwise would have been @@ -82,5 +82,5 @@ Index: qt-2.3.10/src/iconview/qiconview.cpp \reimp */ - + @@ -4939,7 +4985,7 @@ if ( !d->rubber ) @@ -94,5 +94,5 @@ Index: qt-2.3.10/src/iconview/qiconview.cpp @@ -5377,11 +5423,19 @@ return; - + if ( item->d->container1 && d->firstContainer ) { - item->d->container1->items.removeRef( item ); @@ -113,5 +113,5 @@ Index: qt-2.3.10/src/iconview/qiconview.cpp } item->d->container2 = 0; - + Index: qt-2.3.10/src/iconview/qiconview.h =================================================================== @@ -121,5 +121,5 @@ Index: qt-2.3.10/src/iconview/qiconview.h virtual void contentsDropEvent( QDropEvent *e ); #endif - + + void bufferedPaintEvent( QPaintEvent* ); virtual void resizeEvent( QResizeEvent* e ); @@ -133,5 +133,5 @@ Index: qt-2.3.10/src/kernel/qgfxraster_qws.cpp for( loopc2=0;loopc2<frontadd;loopc2++ ) *(alphaptr++)=get_value_32(16,(unsigned char **)&temppos); - + - PackType temp2; - unsigned char * cp; @@ -150,5 +150,5 @@ Index: qt-2.3.10/src/kernel/qgfxraster_qws.cpp temppos += 2; } - + Index: qt-2.3.10/src/kernel/qwindowsystem_qws.cpp =================================================================== @@ -158,5 +158,5 @@ Index: qt-2.3.10/src/kernel/qwindowsystem_qws.cpp { } - + +static void catchSegvSignal( int ) +{ @@ -176,5 +176,5 @@ Index: qt-2.3.10/src/kernel/qwindowsystem_qws.cpp @@ -1043,6 +1055,7 @@ } - + signal(SIGPIPE, ignoreSignal); //we get it when we read + signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash @@ -192,5 +192,5 @@ Index: qt-2.3.10/src/kernel/qwsdecoration_qws.h - Menu=15, LastRegion=Menu }; + Menu=15, LastRegion=Menu, UserDefined = 100 }; - + virtual QRegion region(const QWidget *, const QRect &rect, Region r=All) = 0; virtual void close( QWidget * ); @@ -202,8 +202,8 @@ Index: qt-2.3.10/src/tools/qcstring.h // We want to keep source compatibility for 2.x // ### TODO for 4.0: completely remove these and the cstr* functions - + -#if !defined(QT_GENUINE_STR) +#if 0 - + #undef strlen #define strlen qstrlen @@ -258,5 +258,5 @@ Index: qt-2.3.10/src/widgets/qlistview.cpp @@ -5051,9 +5051,9 @@ l = l->childItem ? l->childItem : l->siblingItem; - + if ( l && l->height() ) - s.setHeight( s.height() + 10 * l->height() ); @@ -266,5 +266,5 @@ Index: qt-2.3.10/src/widgets/qlistview.cpp + else // ^v much too big for handhelds + s.setHeight( s.height() + 30 /*140*/ ); - + if ( s.width() > s.height() * 3 ) s.setHeight( s.width() / 3 ); @@ -291,2 +291,37 @@ Index: qt-2.3.10/src/widgets/qtoolbutton.cpp w = pm.width(); h = pm.height(); +Index: qt-2.3.10/src/widgets/qtabbar.cpp +=================================================================== +--- qt-2.3.10.orig/src/widgets/qtabbar.cpp 2005-02-27 18:07:41.000000000 -0600 ++++ qt-2.3.10/src/widgets/qtabbar.cpp 2005-02-28 11:16:56.444377440 -0600 +@@ -260,7 +260,6 @@ + lstatic->insert( index, newTab ); + + layoutTabs(); +- updateArrowButtons(); + makeVisible( tab( currentTab() ) ); + + #ifndef QT_NO_ACCEL +@@ -282,7 +281,6 @@ + l->remove( t ); + lstatic->remove( t ); + layoutTabs(); +- updateArrowButtons(); + makeVisible( tab( currentTab() ) ); + update(); + } +@@ -887,6 +885,7 @@ + } + for ( t = lstatic->first(); t; t = lstatic->next() ) + t->r.setHeight( r.height() ); ++ updateArrowButtons(); + } + + /*! +@@ -977,7 +976,6 @@ + d->leftB->setGeometry( width() - 2*arrowWidth, 0, arrowWidth, height() ); + #endif + layoutTabs(); +- updateArrowButtons(); + makeVisible( tab( currentTab() )); + } |