Changeset 846 for trunk/src/gui/graphicsview/qgraphicsproxywidget.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/graphicsview/qgraphicsproxywidget.cpp (modified) (5 diffs)

trunk/src/gui/graphicsview/qgraphicsproxywidget.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -976 +976 @@
             }
             break;
+
         case QEvent::ToolTipChange:
             // Propagate tooltip change to the proxy.
@@ -984 +985 @@
             }
             break;
+
         default:
             break;
@@ -1025 +1027 @@
     pos = d->mapToReceiver(pos, receiver);
 
+
+
+
+
+
+
+
+
+
     // Send mouse event. ### Doesn't propagate the event.
     QContextMenuEvent contextMenuEvent(QContextMenuEvent::Reason(event->reason()),
-                                       pos.toPoint(), receiver->mapToGlobal(pos.toPoint()), event->modifiers());
+                                       pos.toPoint(), , event->modifiers());
     QApplication::sendEvent(receiver, &contextMenuEvent);
 
@@ -1498 +1509 @@
   contained in this proxy.
 
-  This function makes it possible to aquire proxies for
+  This function makes it possible to aquire proxies for
   non top-level widgets. For instance, you can embed a dialog,
   and then transform only one of its widgets.