diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 11:15:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 11:15:16 (GMT) |
| commit | f7650a4a05171f759e12f80ca636cc9ffa210142 (patch) | |
| tree | ae1b0204e3325866ba59063768bcbcd47ce96704 /src/gui/graphicsview/qgraphicsscene.cpp | |
| parent | b4b45ecbd79f6dfcbc1a0c1a11b06cec880acdf4 (diff) | |
| parent | 9da13ea53aec6d841ba7f416531d6c52d4368df4 (diff) | |
| download | Qt-f7650a4a05171f759e12f80ca636cc9ffa210142.zip Qt-f7650a4a05171f759e12f80ca636cc9ffa210142.tar.gz Qt-f7650a4a05171f759e12f80ca636cc9ffa210142.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixes tooltips for QGraphicsProxyWidget.
Diffstat (limited to 'src/gui/graphicsview/qgraphicsscene.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index 6581727..b368a82 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -3772,6 +3772,12 @@ void QGraphicsScene::helpEvent(QGraphicsSceneHelpEvent *helpEvent) QGraphicsItem *toolTipItem = 0; for (int i = 0; i < itemsAtPos.size(); ++i) { QGraphicsItem *tmp = itemsAtPos.at(i); + if (tmp->d_func()->isProxyWidget()) { + // if the item is a proxy widget, the event is forwarded to it + sendEvent(tmp, helpEvent); + if (helpEvent->isAccepted()) + return; + } if (!tmp->toolTip().isEmpty()) { toolTipItem = tmp; break; |