Fix mouse wheel handling.

QQuick2 doesn't send mouse wheel events through
the general event() function any more.

Change-Id: I52299670f4956c94d9dd6804aa7e737cfc9f48df
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>

2 files changed, 7 insertions, 27 deletions

diff --git a/src/qwheelarea.cpp b/src/qwheelarea.cpp
index 3ba8b44a..4a8892dc 100644
--- a/src/qwheelarea.cpp
+++ b/src/qwheelarea.cpp
@@ -61,34 +61,14 @@ QWheelArea::~QWheelArea()
 
 }
 
-bool QWheelArea::event(QEvent *e)
+void QWheelArea::wheelEvent(QWheelEvent *we)
 {
-    switch (e->type()) {
-    case QEvent::GraphicsSceneWheel: {
-        QGraphicsSceneWheelEvent *we = static_cast<QGraphicsSceneWheelEvent *>(e);
-
-        if (we->orientation() == Qt::Vertical)
-            setVerticalDelta(we->delta());
-        else
-            setHorizontalDelta(we->delta());
-
-        return true;
+    if (we->orientation() == Qt::Vertical) {
+        setVerticalDelta(we->delta());
+    } else {
+        setHorizontalDelta(we->delta());
     }
-    case QEvent::Wheel: {
-        QWheelEvent *we = static_cast<QWheelEvent *>(e);
-
-        if (we->orientation() == Qt::Vertical)
-            setVerticalDelta(we->delta());
-        else
-            setHorizontalDelta(we->delta());
-
-        return true;
-    }
-    default:
-        break;
-    }
-
-    return QQuickItem::event(e);
+    we->accept();
 }
 
 void QWheelArea::setHorizontalMinimumValue(qreal value)
diff --git a/src/qwheelarea.h b/src/qwheelarea.h
index f9b919fe..19ec0a02 100644
--- a/src/qwheelarea.h
+++ b/src/qwheelarea.h
@@ -90,7 +90,7 @@ public:
     void setScrollSpeed(qreal value);
     qreal scrollSpeed() const;
 
-    virtual bool event(QEvent *e);
+    void wheelEvent(QWheelEvent *event);
 
 Q_SIGNALS:
     void verticalValueChanged();