diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-06-04 13:59:25 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-06-09 07:33:34 (GMT) |
| commit | ba48a3fdf39a3db7a3d13ac15031c810454c6e25 (patch) | |
| tree | 583fbdb939d61845a9474178fc457afa17a4c75a /src/gui/graphicsview/qgraphicsitem_p.h | |
| parent | 2e8a236108f5b78c4d61a254f4097ccf271f90cb (diff) | |
| download | Qt-ba48a3fdf39a3db7a3d13ac15031c810454c6e25.zip Qt-ba48a3fdf39a3db7a3d13ac15031c810454c6e25.tar.gz Qt-ba48a3fdf39a3db7a3d13ac15031c810454c6e25.tar.bz2 | |
Fix bug in QGraphicsItem::effectiveOpacity() caused by typo.
See change 72842b2d, the patch misplaces 'p' and 'parent'. This fixes
the tst_QGraphicsItem::opacity autotests.
Reviewed-by: bnilsen
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem_p.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 2752056..9be9310 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -296,10 +296,11 @@ public: // parent propagates to me, then combine my local opacity with my parent's // effective opacity into my effective opacity. if ((myFlags & QGraphicsItem::ItemIgnoresParentOpacity) - || (parentFlags & QGraphicsItem::ItemDoesntPropagateOpacityToChildren)) + || (parentFlags & QGraphicsItem::ItemDoesntPropagateOpacityToChildren)) { break; + } - o *= parent->d_ptr->opacity; + o *= p->d_ptr->opacity; p = p->d_ptr->parent; myFlags = parentFlags; } |