diff -u qt4-x11-4.4.3/debian/changelog qt4-x11-4.4.3/debian/changelog --- qt4-x11-4.4.3/debian/changelog +++ qt4-x11-4.4.3/debian/changelog @@ -1,3 +1,10 @@ +qt4-x11 (4.4.3-1ubuntu5) jaunty; urgency=low + + * Add 0260-fix-qgraphicswidget-deletionclearFocus.diff from KDE's qt-copy + Fixes KDE bug 168278 observable in the file watcher plasmoid (LP: #272399) + + -- Jonathan Thomas Wed, 03 Dec 2008 18:54:29 -0500 + qt4-x11 (4.4.3-1ubuntu4) jaunty; urgency=low * Fix binary-post-install/libqt4-dev:: to install to debian/libqt4-dev diff -u qt4-x11-4.4.3/debian/patches/series qt4-x11-4.4.3/debian/patches/series --- qt4-x11-4.4.3/debian/patches/series +++ qt4-x11-4.4.3/debian/patches/series @@ -14,6 +14,7 @@ 0248-fix-qwidget-scroll-slowness.diff 0249-webkit-stale-frame-pointer.diff 0254-fix-qgraphicsproxywidget-deletion-crash.diff +0260-fix-qgraphicswidget-deletionclearFocus.diff # debian patches 01_qmake_for_debian.diff only in patch2: unchanged: --- qt4-x11-4.4.3.orig/debian/patches/0260-fix-qgraphicswidget-deletionclearFocus.diff +++ qt4-x11-4.4.3/debian/patches/0260-fix-qgraphicswidget-deletionclearFocus.diff @@ -0,0 +1,23 @@ +qt-bugs@ issue : none +Trolltech task ID : None +applied: no +author: Alexis Menard + +Fix deletion of a qgraphicswidget on clear focus even if it doesn't have the focus. + +Will be included in 4.4.4 + +Index: src/gui/graphicsview/qgraphicsitem.cpp +=================================================================== +--- a/src/gui/graphicsview/qgraphicsitem.cpp (revision 883124) ++++ b/src/gui/graphicsview/qgraphicsitem.cpp (working copy) +@@ -1951,7 +1951,7 @@ + */ + void QGraphicsItem::clearFocus() + { +- if (!d_ptr->scene || !hasFocus()) ++ if (!d_ptr->scene) + return; + if (d_ptr->isWidget) { + // Invisible widget items with focus must explicitly clear subfocus. +