From: J-P Nurmi <jpnurmi@digia.com>
Date: Sun, 4 Aug 2013 22:28:25 +0000 (+0200)
Subject: QQuickWindow: handle QWheelEvent::phase
X-Git-Tag: upstream/5.2.1~675
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3fd8b5b27dbb39edf5b398b05e58ceccb0a25ebc;p=platform%2Fupstream%2Fqtdeclarative.git

QQuickWindow: handle QWheelEvent::phase

Change-Id: Id2540caae7e5703d352d0cb115529b1be1c21d96
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
---

diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index d209cb5..962b984 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -1509,7 +1509,7 @@ bool QQuickWindowPrivate::deliverWheelEvent(QQuickItem *item, QWheelEvent *event
 
     if (item->contains(p)) {
         QWheelEvent wheel(p, p, event->pixelDelta(), event->angleDelta(), event->delta(),
-                          event->orientation(), event->buttons(), event->modifiers());
+                          event->orientation(), event->buttons(), event->modifiers(), event->phase());
         wheel.accept();
         q->sendEvent(item, &wheel);
         if (wheel.isAccepted()) {
@@ -1530,7 +1530,7 @@ void QQuickWindow::wheelEvent(QWheelEvent *event)
 #endif
 
     //if the actual wheel event was accepted, accept the compatibility wheel event and return early
-    if (d->lastWheelEventAccepted && event->angleDelta().isNull())
+    if (d->lastWheelEventAccepted && event->angleDelta().isNull() && event->phase() == Qt::ScrollUpdate)
         return;
 
     event->ignore();