diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-13 09:51:04 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-13 09:51:11 (GMT) |
| commit | 63856f13721bce420fe94dab31c36329af976276 (patch) | |
| tree | 5a2c1d5d49a76a7794fcfd46a6fa664f657ae0fe /src/gui/kernel/qwidget_p.h | |
| parent | f5c5cc585cef8d2d2f77e7d83d7a07c6d70f0d09 (diff) | |
| parent | 6e209bb09f3feef210bc65f94cf8f58dd8e3b4a9 (diff) | |
| download | Qt-63856f13721bce420fe94dab31c36329af976276.zip Qt-63856f13721bce420fe94dab31c36329af976276.tar.gz Qt-63856f13721bce420fe94dab31c36329af976276.tar.bz2 | |
Merge commit upstream/4.6 into oslo-staging-2/4.6
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
| -rw-r--r-- | src/gui/kernel/qwidget_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index df28bac..eea929b 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -479,7 +479,7 @@ public: QGraphicsProxyWidget *ancestorProxy = widget->d_func()->nearestGraphicsProxyWidget(widget); //It's embedded if it has an ancestor if (ancestorProxy) { - if (!bypassGraphicsProxyWidget(widget)) { + if (!bypassGraphicsProxyWidget(widget) && ancestorProxy->scene() != 0) { // One view, let be smart and return the viewport rect then the popup is aligned if (ancestorProxy->scene()->views().size() == 1) { QGraphicsView *view = ancestorProxy->scene()->views().at(0); |