Moved the code that translated QGestureEvent to

QGraphicsSceneGestureEvent to a viewport, so that the user could
subscribe to gestures in a viewport as well.

1 files changed, 13 insertions, 10 deletions

diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp
index 925763c..6f142e3 100644
--- a/src/gui/graphicsview/qgraphicsview.cpp
+++ b/src/gui/graphicsview/qgraphicsview.cpp
@@ -2862,16 +2862,8 @@ bool QGraphicsView::event(QEvent *event)
                 }
             }
             break;
-        case QEvent::Gesture: {
-            QGraphicsSceneGestureEvent gestureEvent;
-            gestureEvent.setWidget(this);
-            QGestureEvent *ev = static_cast<QGestureEvent*>(event);
-            gestureEvent.setGestures(ev->gestures());
-            gestureEvent.setCancelledGestures(ev->cancelledGestures());
-            QApplication::sendEvent(d->scene, &gestureEvent);
-            if (gestureEvent.isAccepted())
-                return true;
-        }
+        case QEvent::Gesture:
+            viewportEvent(event);
             break;
         default:
             break;
@@ -2953,6 +2945,17 @@ bool QGraphicsView::viewportEvent(QEvent *event)
             d->scene->d_func()->updateAll = false;
         }
         break;
+    case QEvent::Gesture: {
+        QGraphicsSceneGestureEvent gestureEvent;
+        gestureEvent.setWidget(this);
+        QGestureEvent *ev = static_cast<QGestureEvent*>(event);
+        gestureEvent.setGestures(ev->gestures());
+        gestureEvent.setCancelledGestures(ev->cancelledGestures());
+        QApplication::sendEvent(d->scene, &gestureEvent);
+        if (gestureEvent.isAccepted())
+            return true;
+    }
+        break;
     case QEvent::TouchBegin:
     case QEvent::TouchUpdate:
     case QEvent::TouchEnd: