[SCM] qtdeclarative packaging branch, master, updated. 33d7cb39d0e643fd507e7394d0b7913c9899154a

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=33d7cb3

The following commit has been merged in the master branch:
commit 33d7cb39d0e643fd507e7394d0b7913c9899154a
Author: Daniel d'Andrada <daniel.dandrada at canonical.com>
Date:   Thu Mar 21 06:36:03 2013 +0000

    Forcing mouse event ownership
    
    This patch forces the mouse event ownership in case we are already
    the grabber
---
 debian/patches/series                              |    1 +
 .../we_do_want_the_mouse_event_to_ourselves.patch  |   28 ++++++++++++++++++++
 2 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 752bbdd..bb8d999 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_lp1087643.patch
+we_do_want_the_mouse_event_to_ourselves.patch
diff --git a/debian/patches/we_do_want_the_mouse_event_to_ourselves.patch b/debian/patches/we_do_want_the_mouse_event_to_ourselves.patch
new file mode 100644
index 0000000..331dffc
--- /dev/null
+++ b/debian/patches/we_do_want_the_mouse_event_to_ourselves.patch
@@ -0,0 +1,28 @@
+Description: Forcing mouse event ownership
+ This patch forces the mouse event ownership in case we are already 
+ the grabber
+
+Author: Daniel d'Andrada <daniel.dandrada at canonical.com>
+
+---
+
+Origin: Canonical
+Forwarded: https://codereview.qt-project.org/#patch,all_unified,43275,4
+Last-Update: 2012-12-15
+
+--- qtdeclarative-5.0-release~beta+20120831.orig/src/quick/items/qquickflickable.cpp
++++ qtdeclarative-5.0-release~beta+20120831/src/quick/items/qquickflickable.cpp
+@@ -1984,6 +1984,13 @@ bool QQuickFlickable::sendMouseEvent(QMo
+ 
+     QQuickWindow *c = window();
+     QQuickItem *grabber = c ? c->mouseGrabberItem() : 0;
++    if (grabber) {
++        QQuickItem *this_item = qobject_cast<QQuickItem *>(this);
++        if (grabber == this_item && d->stealMouse) {
++            // we are already the grabber and we do want the mouse event to ourselves.
++            return true;
++        }
++    }
+     bool grabberDisabled = grabber && !grabber->isEnabled();
+     bool stealThisEvent = d->stealMouse;
+     if ((stealThisEvent || contains(localPos)) && (!grabber || !grabber->keepMouseGrab() || grabberDisabled)) {

-- 
qtdeclarative packaging