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

[Timo Jyrinki]

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

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

    Multiple overlapping QML MouseAreas gave incorrect events
    
    Multiple overlapping QML MouseAreas gave incorrect events. This patch
    prevents the issue.
---
 debian/patches/fix_lp1087643.patch |   33 +++++++++++++++++++++++++++++++++
 debian/patches/series              |    1 +
 2 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/debian/patches/fix_lp1087643.patch b/debian/patches/fix_lp1087643.patch
new file mode 100644
index 0000000..3e9e5f7
--- /dev/null
+++ b/debian/patches/fix_lp1087643.patch
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 0000000..752bbdd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_lp1087643.patch

-- 
qtdeclarative packaging