[SCM] qtdeclarative packaging branch, master, updated. df28a591223c8efbd5ee471a6e649c166bc45eea

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit eaa0208fe5826afa0c6421d76902f75e24de6fd4
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Apr 20 14:33:11 2013 -0300

    Remove patches that don't apply anymore.
---
 debian/patches/fix_lp1087643.patch                 |   33 --------------------
 debian/patches/series                              |    2 -
 .../we_do_want_the_mouse_event_to_ourselves.patch  |   28 -----------------
 3 files changed, 0 insertions(+), 63 deletions(-)

diff --git a/debian/patches/fix_lp1087643.patch b/debian/patches/fix_lp1087643.patch
deleted file mode 100644
index 3e9e5f7..0000000
--- a/debian/patches/fix_lp1087643.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Multiple overlapping QML MouseAreas gave incorrect events
- Multiple overlapping QML MouseAreas gave incorrect events. This patch 
- prevents the issue.
-
-Author: Daniel d'Andrada <daniel.dandrada at canonical.com>
-Origin: Canonical
-Forwarded: https://codereview.qt-project.org/#change,43270
-Last-Update: 2012-12-15
-
----
---- qtdeclarative-5.0-release~beta+20120831.orig/src/quick/items/qquickwindow.cpp
-+++ qtdeclarative-5.0-release~beta+20120831/src/quick/items/qquickwindow.cpp
-@@ -430,8 +430,18 @@ bool QQuickWindowPrivate::translateTouch
-             if (!item->contains(pos))
-                 break;
- 
--            bool doubleClick = event->timestamp() - touchMousePressTimestamp
--                            < static_cast<ulong>(qApp->styleHints()->mouseDoubleClickInterval());
-+            bool doubleClick;
-+            {
-+                ulong timeBetweenPresses = event->timestamp() - touchMousePressTimestamp;
-+                if (timeBetweenPresses != 0) {
-+                    ulong doubleClickInterval = static_cast<ulong>(qApp->styleHints()->mouseDoubleClickInterval());
-+                    doubleClick = timeBetweenPresses < doubleClickInterval;
-+                } else {
-+                    // we are still dealing with the same event that generated
-+                    // the previous press timestamp
-+                    doubleClick = false;
-+                }
-+            }
-             touchMousePressTimestamp = event->timestamp();
-             // Store the id already here and restore it to -1 if the event does not get
-             // accepted. Cannot defer setting the new value because otherwise if the event
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index bb8d999..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 331dffc..0000000
--- a/debian/patches/we_do_want_the_mouse_event_to_ourselves.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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