diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-13 09:17:15 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-13 09:17:15 (GMT) |
| commit | e287f1b01dd50106f58967861a1c272b248d450a (patch) | |
| tree | 0b1f2d787772fc0c27d9daf368823ea65a1ccaf0 /src/gui/kernel/qwidget_p.h | |
| parent | 2e5706eeee2fb9ce543466f469ace2d49ed4be64 (diff) | |
| parent | 99b19431e6846a36a65f23d21a95140a081d1f1a (diff) | |
| download | Qt-e287f1b01dd50106f58967861a1c272b248d450a.zip Qt-e287f1b01dd50106f58967861a1c272b248d450a.tar.gz Qt-e287f1b01dd50106f58967861a1c272b248d450a.tar.bz2 | |
Merge commit 'upstream/4.6' into 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); |