diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2014-12-20 06:36:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-12-20 07:59:07 +0100 |
| commit | 86d04cfe2bdceca401cab228bd63245f16e65731 (patch) | |
| tree | 4273b2f5879371d130cce0d6a97a7eb75175c980 /src/widgets/graphicsview | |
| parent | 0dd38014b307f12368888c089195b084158f94a3 (diff) | |
| parent | e281537f2049af0b96fd87158f2b7212afe8ab5f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/graphicsview')
| -rw-r--r-- | src/widgets/graphicsview/qgraphicsitem.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/graphicsview/qgraphicsproxywidget.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index 03f22a270f..a543445244 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -6592,7 +6592,7 @@ void QGraphicsItem::setData(int key, const QVariant &value) For example: - \snippet code/src_gui_graphicsview_qgraphicsitem.cpp QGraphicsItem type + \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 1 \sa UserType */ diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp index 68bc2ae1fa..a56c671180 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp +++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp @@ -270,6 +270,7 @@ void QGraphicsProxyWidgetPrivate::sendWidgetMouseEvent(QGraphicsSceneMouseEvent QMouseEvent mouseEvent(type, pos, receiver->mapTo(receiver->topLevelWidget(), pos.toPoint()), receiver->mapToGlobal(pos.toPoint()), event->button(), event->buttons(), event->modifiers()); + QGuiApplicationPrivate::setMouseEventSource(&mouseEvent, event->source()); QWidget *embeddedMouseGrabberPtr = (QWidget *)embeddedMouseGrabber; QApplicationPrivate::sendMouseEvent(receiver, &mouseEvent, alienWidget, widget, |