diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-13 09:05:24 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-13 09:05:48 (GMT) |
commit | dee871b4375c2625217448f2b15e4518b7f9d993 (patch) | |
tree | 62a1fd5e271dbf0b9359d4f7fbad006541a88cef /src/gui/graphicsview/qgraphicsproxywidget.cpp | |
parent | 9c6e466dc09813dd4a641b2cf385f35ac99346f5 (diff) | |
parent | 6a1be803bf94b8af4a4766e31df9b441d1c81eed (diff) | |
download | Qt-dee871b4375c2625217448f2b15e4518b7f9d993.zip Qt-dee871b4375c2625217448f2b15e4518b7f9d993.tar.gz Qt-dee871b4375c2625217448f2b15e4518b7f9d993.tar.bz2 |
Merge qt-team-widgets/4.6 into origin/4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicsproxywidget.cpp')
-rw-r--r-- | src/gui/graphicsview/qgraphicsproxywidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsproxywidget.cpp b/src/gui/graphicsview/qgraphicsproxywidget.cpp index 15b9ff3..b7a3962 100644 --- a/src/gui/graphicsview/qgraphicsproxywidget.cpp +++ b/src/gui/graphicsview/qgraphicsproxywidget.cpp @@ -973,7 +973,7 @@ void QGraphicsProxyWidget::hideEvent(QHideEvent *event) void QGraphicsProxyWidget::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { Q_D(QGraphicsProxyWidget); - if (!event || !d->widget || !d->widget->isVisible()) + if (!event || !d->widget || !d->widget->isVisible() || !hasFocus()) return; // Find widget position and receiver. |