diff -Nru qt4-x11-4.8.1/debian/changelog qt4-x11-4.8.1/debian/changelog --- qt4-x11-4.8.1/debian/changelog 2012-04-12 16:50:00.000000000 +0100 +++ qt4-x11-4.8.1/debian/changelog 2012-04-24 16:45:47.000000000 +0100 @@ -1,3 +1,11 @@ +qt4-x11 (4:4.8.1-0ubuntu4.1) precise-proposed; urgency=low + + * Add kubuntu_33_shaped_drag.diff fixes LP: #987855 + "problem in Qt dragging when all of the window target has been + shaped out for input" + + -- Jonathan Riddell Tue, 24 Apr 2012 16:44:41 +0100 + qt4-x11 (4:4.8.1-0ubuntu4) precise-proposed; urgency=low * Rebuild for .pot generation diff -Nru qt4-x11-4.8.1/debian/patches/kubuntu_33_shaped_drag.diff qt4-x11-4.8.1/debian/patches/kubuntu_33_shaped_drag.diff --- qt4-x11-4.8.1/debian/patches/kubuntu_33_shaped_drag.diff 1970-01-01 01:00:00.000000000 +0100 +++ qt4-x11-4.8.1/debian/patches/kubuntu_33_shaped_drag.diff 2012-04-24 16:44:07.000000000 +0100 @@ -0,0 +1,22 @@ +commit f5eb19bc4dca6f3bfaaf832784a3cbca24dba479 +Author: Albert Astals Cid +Date: Tue Apr 24 13:45:46 2012 +0200 + No rectangles means no interaction with the window + And some tests to prove this change is needed + Change-Id: I6dd6c75c2bd70463561445b4f4a3894c80981d26 + +Index: qt4-x11-4.8.1/src/gui/kernel/qdnd_x11.cpp +=================================================================== +--- qt4-x11-4.8.1.orig/src/gui/kernel/qdnd_x11.cpp 2012-04-24 16:43:29.248208902 +0100 ++++ qt4-x11-4.8.1/src/gui/kernel/qdnd_x11.cpp 2012-04-24 16:43:40.960208473 +0100 +@@ -1431,9 +1431,8 @@ + { + int nrectanglesRet, dummyOrdering; + XRectangle *rectangles = XShapeGetRectangles(QX11Info::display(), w, shapeType, &nrectanglesRet, &dummyOrdering); +- bool interacts = true; ++ bool interacts = false; + if (rectangles) { +- interacts = false; + for (int i = 0; !interacts && i < nrectanglesRet; ++i) + interacts = QRect(rectangles[i].x, rectangles[i].y, rectangles[i].width, rectangles[i].height).contains(pos); + XFree(rectangles); diff -Nru qt4-x11-4.8.1/debian/patches/series qt4-x11-4.8.1/debian/patches/series --- qt4-x11-4.8.1/debian/patches/series 2012-04-11 09:57:48.000000000 +0100 +++ qt4-x11-4.8.1/debian/patches/series 2012-04-24 16:43:20.000000000 +0100 @@ -55,3 +55,4 @@ kubuntu_95_qt_disable_bounce.diff kubuntu_97_a11y_qt_and_qml_backport.diff kubuntu_31_unity_workarea_atom.diff +kubuntu_33_shaped_drag.diff