Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Try to use multisampled opengl graphicssystem on all platforms
  Make sure recreateEglSurface creates a surface if there isn't one
  QX11GL: Implement QX11GLWindowSurface::grabWidget
  QX11GL: Cleanup the window surface & remove some synchronisation
  QX11GL: Move the shared context ownership into a seperate class
  QX11GL: Don't do glFinish in endPaint
  Implement QGLPaintDevice::metric()
  Remove dead code left after a merge conflict resolution
  Fixed autotest failures in tst_QPainterPath.
  Removed bezier intersection code in path clipper.
  Diagram scene example (graphicsview/diagramscene) refresh problem.
  When using Qt::BypassGraphicsProxyWidget with QMenu the application is not stuck anymore

1 files changed, 10 insertions, 1 deletions

diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/gui/graphicsview/qgraphicsproxywidget.cpp
index ad7cf5d..1f89714 100644
--- a/src/gui/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp
@@ -1024,9 +1024,18 @@ void QGraphicsProxyWidget::contextMenuEvent(QGraphicsSceneContextMenuEvent *even
     // Map event position from us to the receiver
     pos = d->mapToReceiver(pos, receiver);
 
+    QPoint globalPos = receiver->mapToGlobal(pos.toPoint());
+    //If the receiver by-pass the proxy its popups
+    //will be top level QWidgets therefore they need
+    //the screen position. mapToGlobal expect the widget to
+    //have proper coordinates in regards of the windowing system
+    //but it's not true because the widget is embedded.
+    if (bypassGraphicsProxyWidget(receiver))
+        globalPos = event->screenPos();
+
     // Send mouse event. ### Doesn't propagate the event.
     QContextMenuEvent contextMenuEvent(QContextMenuEvent::Reason(event->reason()),
-                                       pos.toPoint(), receiver->mapToGlobal(pos.toPoint()), event->modifiers());
+                                       pos.toPoint(), globalPos, event->modifiers());
     QApplication::sendEvent(receiver, &contextMenuEvent);
 
     event->setAccepted(contextMenuEvent.isAccepted());