QQuickWindow: move deliverGestureEvent outside QT_NO_WHEELEVENT section

Turning off support for wheel events does not affect gesture support.

Change-Id: I64a110327179d62a69864979396b92472c53285e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
Reviewed-by: Andrew Knight <qt@panimo.net>

1 files changed, 16 insertions, 17 deletions

diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index d2b5786125..cb1af51b69 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -1756,6 +1756,22 @@ bool QQuickWindowPrivate::deliverWheelEvent(QQuickItem *item, QWheelEvent *event
     return false;
 }
 
+/*! \reimp */
+void QQuickWindow::wheelEvent(QWheelEvent *event)
+{
+    Q_D(QQuickWindow);
+    qCDebug(DBG_MOUSE) << "QQuickWindow::wheelEvent()" << event->pixelDelta() << event->angleDelta() << event->phase();
+
+    //if the actual wheel event was accepted, accept the compatibility wheel event and return early
+    if (d->lastWheelEventAccepted && event->angleDelta().isNull() && event->phase() == Qt::ScrollUpdate)
+        return;
+
+    event->ignore();
+    d->deliverWheelEvent(d->contentItem, event);
+    d->lastWheelEventAccepted = event->isAccepted();
+}
+#endif // QT_NO_WHEELEVENT
+
 bool QQuickWindowPrivate::deliverGestureEvent(QQuickItem *item, QNativeGestureEvent *event)
 {
     QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
@@ -1788,23 +1804,6 @@ bool QQuickWindowPrivate::deliverGestureEvent(QQuickItem *item, QNativeGestureEv
     return false;
 }
 
-/*! \reimp */
-void QQuickWindow::wheelEvent(QWheelEvent *event)
-{
-    Q_D(QQuickWindow);
-    qCDebug(DBG_MOUSE) << "QQuickWindow::wheelEvent()" << event->pixelDelta() << event->angleDelta() << event->phase();
-
-    //if the actual wheel event was accepted, accept the compatibility wheel event and return early
-    if (d->lastWheelEventAccepted && event->angleDelta().isNull() && event->phase() == Qt::ScrollUpdate)
-        return;
-
-    event->ignore();
-    d->deliverWheelEvent(d->contentItem, event);
-    d->lastWheelEventAccepted = event->isAccepted();
-}
-#endif // QT_NO_WHEELEVENT
-
-
 bool QQuickWindowPrivate::deliverTouchCancelEvent(QTouchEvent *event)
 {
     qCDebug(DBG_TOUCH) << event;