Fixes: NB#211964 - Additional click is emitted when accessing object menu

RevBy: to be done
Details: The scene window should not send cancel event on it's own.

1 files changed, 3 insertions, 14 deletions

diff --git a/src/corelib/widgets/mscenewindow.cpp b/src/corelib/widgets/mscenewindow.cpp
index 4822f2bc..cf0c5183 100644
--- a/src/corelib/widgets/mscenewindow.cpp
+++ b/src/corelib/widgets/mscenewindow.cpp
@@ -316,20 +316,9 @@ void MSceneWindow::tapAndHoldGestureEvent(QGestureEvent *event, QTapAndHoldGestu
 
         if (contextEvent.isAccepted() && d->waitingForContextMenuEvent) {
             //Event has been accepted by some widget on top of this scenewindow.
-            if ((scene() == NULL) || (scene()->views().size() == 0)) {
-                // If this widget has been removed from the scene and/or there
-                // is no view, return
-                return;
-            }
-
-            MCancelEvent cancelEvent;
-            QList<QGraphicsItem*> affectedItems = scene()->items(gesture->hotSpot());
-            QGraphicsItem *item = 0;
-
-            foreach(item, affectedItems) {
-                if (scene()->items().contains(item))
-                    scene()->sendEvent(item, &cancelEvent);
-            }
+            MScene *mScene = qobject_cast<MScene *>(scene());
+            if (mScene)
+                mScene->d_func()->notifyChildRequestedMouseCancel();
         }
         d->waitingForContextMenuEvent = false;