diff -Nura qt-copy-kde-patches/0203-qtexthtmlparser-link-color.diff qt-copy-patches-880178/0203-qtexthtmlparser-link-color.diff --- qt-copy-kde-patches/0203-qtexthtmlparser-link-color.diff 2008-05-07 00:54:28.000000000 +0200 +++ qt-copy-patches-880178/0203-qtexthtmlparser-link-color.diff 2008-06-12 13:44:15.000000000 +0200 @@ -1,5 +1,5 @@ qt-bugs@ issue : N190509 -Trolltech task ID : 190904 +Trolltech task ID : 190904 (Status: closed; Version fix: 4.5.0) applied: no author: Rafael Fernández López diff -Nura qt-copy-kde-patches/0214-fix-qgraphicsproxywidget-tab-crash.diff qt-copy-patches-880178/0214-fix-qgraphicsproxywidget-tab-crash.diff --- qt-copy-kde-patches/0214-fix-qgraphicsproxywidget-tab-crash.diff 2008-05-07 00:54:28.000000000 +0200 +++ qt-copy-patches-880178/0214-fix-qgraphicsproxywidget-tab-crash.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -qt-bugs@ issue : N199058 -Trolltech task ID : none -applied: no -author: Frerich Raabe - -Fixes a crash in QGraphicsProxyWidget which was triggered when no -QGraphicsProxyWidget item in a QGraphicsScene had a QWidget associated -with it. As soon as the user pressed , QGraphicsProxyWidget -attempted to give the focus to *some* QWidget (even if it was null). - -Index: src/gui/graphicsview/qgraphicsproxywidget.cpp -=================================================================== ---- src/gui/graphicsview/qgraphicsproxywidget.cpp (revision 775038) -+++ src/gui/graphicsview/qgraphicsproxywidget.cpp (working copy) -@@ -323,6 +323,10 @@ - } - } - -+ if (!child) { -+ return 0; -+ } -+ - QWidget *oldChild = child; - do { - if (child->isEnabled() diff -Nura qt-copy-kde-patches/0216-allow-isystem-for-headers.diff qt-copy-patches-880178/0216-allow-isystem-for-headers.diff --- qt-copy-kde-patches/0216-allow-isystem-for-headers.diff 2008-05-07 00:54:28.000000000 +0200 +++ qt-copy-patches-880178/0216-allow-isystem-for-headers.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -qt-bugs@ issue : 199610 -Trolltech task ID : -bugs.kde.org number : -applied: no -author: Benjamin Reed - -I don't have the exact output anymore (I've since patched Qt's configure) but -essentially, since I have pcre.h in /opt/kde4-deps/include, it was -conflicting with Qt's (modified) pcre.h in the WebKit bits, since --I /opt/kde4-deps/include ends up in CXXFLAGS in the generated makefiles, it -comes *before* the specific locations in INCPATH on the compile line, and you -end up with a conflict with the system-installed pcre.h. - -Presumably, if your pcre.h is in /usr/include as on most Linux systems, you -wouldn't notice this issue since /usr/include's already in your include path -and people likely don't pass -I /usr/include to configure. I suspect that on -any platform with a regular, system-installed pcre.h (or clucene headers), -adding -I /usr/include would exhibit this bug, just as a custom-installed -pcre/clucene in another root would. - -This patch adds support for using -isystem to allow putting an include -directory at the end of the compiler's header search path. - - -Index: configure -=================================================================== ---- configure (revision 777050) -+++ configure (working copy) -@@ -811,6 +811,11 @@ - VAL=`echo $1 | sed 's,-D,,'` - fi - ;; -+ -isystem) -+ VAR="add_isystempath" -+ shift -+ VAL="$1" -+ ;; - -I?*|-I) - VAR="add_ipath" - if [ "$1" = "-I" ]; then -@@ -1666,6 +1671,9 @@ - add_ipath) - I_FLAGS="$I_FLAGS -I\"${VAL}\"" - ;; -+ add_isystempath) -+ I_FLAGS="$I_FLAGS -isystem \"${VAL}\"" -+ ;; - add_lpath) - L_FLAGS="$L_FLAGS -L\"${VAL}\"" - ;; diff -Nura qt-copy-kde-patches/0225-invalidate-tabbar-geometry-on-refresh.patch qt-copy-patches-880178/0225-invalidate-tabbar-geometry-on-refresh.patch --- qt-copy-kde-patches/0225-invalidate-tabbar-geometry-on-refresh.patch 2008-05-07 00:54:28.000000000 +0200 +++ qt-copy-patches-880178/0225-invalidate-tabbar-geometry-on-refresh.patch 2008-09-21 23:22:49.000000000 +0200 @@ -1,5 +1,5 @@ -qt-bugs@ issue : None -Trolltech task ID : None +qt-bugs@ issue : 208185 +Trolltech task ID : 208349 bugs.kde.org number : 159014 applied: no author: Robert Knight diff -Nura qt-copy-kde-patches/0226-qtreeview-column_resize_when_needed.diff qt-copy-patches-880178/0226-qtreeview-column_resize_when_needed.diff --- qt-copy-kde-patches/0226-qtreeview-column_resize_when_needed.diff 2008-05-07 00:54:28.000000000 +0200 +++ qt-copy-patches-880178/0226-qtreeview-column_resize_when_needed.diff 2008-05-08 00:04:13.000000000 +0200 @@ -1,5 +1,5 @@ -qt-bugs@ issue : None -Trolltech task ID : None +qt-bugs@ issue : N209927 +Trolltech task ID : 210390 bugs.kde.org number : None applied: no author: Rafael Fernández López @@ -103,8 +103,8 @@ @@ -101,6 +101,7 @@ QPixmap after; }; - + + void _q_forceColumnResizeToFitContents(); void expand(int item, bool emitSignal); void collapse(int item, bool emitSignal); - + diff -Nura qt-copy-kde-patches/0234-fix-mysql-threaded.diff qt-copy-patches-880178/0234-fix-mysql-threaded.diff --- qt-copy-kde-patches/0234-fix-mysql-threaded.diff 2008-07-08 14:00:28.000000000 +0200 +++ qt-copy-patches-880178/0234-fix-mysql-threaded.diff 2008-09-19 12:03:01.000000000 +0200 @@ -1,7 +1,7 @@ qt-bugs@ issue : N217716 Trolltech task ID : 217788 bugs.kde.org number : no report -applied: yes +applied: no author: Tobias Koenig This patch will fix the handling of connections to diff -Nura qt-copy-kde-patches/0238-fix-qt-qttabbar-size.diff qt-copy-patches-880178/0238-fix-qt-qttabbar-size.diff --- qt-copy-kde-patches/0238-fix-qt-qttabbar-size.diff 2008-07-24 00:17:44.000000000 +0200 +++ qt-copy-patches-880178/0238-fix-qt-qttabbar-size.diff 2008-09-18 22:53:56.000000000 +0200 @@ -1,5 +1,5 @@ qt-bugs@ issue : N216195 -Trolltech task ID : 216537 +Trolltech task ID : 216537 (Applied in Qt 4.5) bugs.kde.org number : 162737 applied: no author: Michael Leupold diff -Nura qt-copy-kde-patches/0248-fix-qwidget-scroll-slowness.diff qt-copy-patches-880178/0248-fix-qwidget-scroll-slowness.diff --- qt-copy-kde-patches/0248-fix-qwidget-scroll-slowness.diff 2008-09-15 20:02:54.000000000 +0200 +++ qt-copy-patches-880178/0248-fix-qwidget-scroll-slowness.diff 2008-09-16 18:19:11.000000000 +0200 @@ -13,12 +13,29 @@ =================================================================== --- src/gui/painting/qbackingstore.cpp (révision 860438) +++ src/gui/painting/qbackingstore.cpp (copie de travail) -@@ -523,7 +523,7 @@ +@@ -523,7 +523,8 @@ } bool overlapped = false; - bool accelerateScroll = accelEnv && isOpaque() && !(overlapped = isOverlapped(data.crect)); -+ bool accelerateScroll = accelEnv && isOpaque() && !(overlapped = isOverlapped(rect & data.crect)); ++ QRect cRect = clipRect(); ++ bool accelerateScroll = accelEnv && isOpaque() && !(overlapped = isOverlapped(rect & cRect)); #if defined(Q_WS_QWS) QWSWindowSurface *surface; +@@ -558,13 +559,13 @@ + #ifdef Q_WS_QWS + QWSWindowSurface *surface = static_cast(wbs->windowSurface); + const QRegion clip = surface->clipRegion().translated(-toplevelOffset) +- & clipRect(); ++ & cRect; + const QRect scrollRect = rect & clip.boundingRect(); + const QRect destRect = scrollRect.translated(dx, dy) + & scrollRect + & clip.boundingRect(); + #else +- QRect scrollRect = rect & clipRect(); ++ QRect scrollRect = rect & cRect; + + QRect destRect = scrollRect.isValid() ? scrollRect.translated(dx,dy).intersected(scrollRect) : QRect(); + diff -Nura qt-copy-kde-patches/0256-fix-recursive-backingstore-sync-crash.diff qt-copy-patches-880178/0256-fix-recursive-backingstore-sync-crash.diff --- qt-copy-kde-patches/0256-fix-recursive-backingstore-sync-crash.diff 1970-01-01 01:00:00.000000000 +0100 +++ qt-copy-patches-880178/0256-fix-recursive-backingstore-sync-crash.diff 2008-11-06 11:18:45.000000000 +0100 @@ -0,0 +1,40 @@ +qt-bugs@ issue : N227209 +Trolltech task ID : none yet +bugs.kde.org number : 174065 +applied: yes +author: Szymon Tomasz Stefanek + +This patch fixes a crash deep inside the qt painting engine. + +The toplevel shared painter is instantiated by the topmost window +which "owns" the backingstore buffer. The topmost window then recursively +asks the children to paint themselves with the shared painter. +With certain widget hierarchies it turns out that the topmost window +may be asked to paint itself deep inside the recursive painting stack: +a sort of "hierarchy-looping recursion". +The window will do the job and then happily destroy the shared +painter leaving the outer stack frames with a dangling pointer. + +This patch stops the "looping recursion" when it's triggered +with a shared painter already active. The bug doesn't seem to +be present in qt 4.5 snapshots, but in the meantime we need this fix. + + +Index: src/gui/painting/qbackingstore.cpp +=================================================================== +--- src/gui/painting/qbackingstore.cpp (revision 879741) ++++ src/gui/painting/qbackingstore.cpp (working copy) +@@ -987,8 +987,12 @@ + return; + } + +- if (tlw->updatesEnabled()) { ++ // With certain widget hierarchies we may end up being called recursively ++ // on the same toplevel. This is likely to explode once the painter is released ++ // in the code below (since there is no reference counting). Avoid it. ++ bool alreadyPainting = tlwExtra->sharedPainter && tlwExtra->sharedPainter->isActive(); + ++ if (tlw->updatesEnabled() && !alreadyPainting) { + // hw: XXX the toClean region is not correct if !dirtyWidgets.isEmpty() + + // Pre render config