summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsitem_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2009-05-28 20:55:49 (GMT)
committerAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2009-06-09 07:27:59 (GMT)
commitbea8a19742ed1decbd63464e36e57980fbde7016 (patch)
tree95122123bee01604e2b63cc1c226f943724e8de6 /src/gui/graphicsview/qgraphicsitem_p.h
parent72e083c98c3adb07bb1578fb7f28f121fc3f34ac (diff)
downloadQt-bea8a19742ed1decbd63464e36e57980fbde7016.zip
Qt-bea8a19742ed1decbd63464e36e57980fbde7016.tar.gz
Qt-bea8a19742ed1decbd63464e36e57980fbde7016.tar.bz2
fix a small logic bug in childrenCombineOpacity
Regression introduced during refactoring earlier today.
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem_p.h')
-rw-r--r--src/gui/graphicsview/qgraphicsitem_p.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index 95a7733..acd2fcc 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -272,7 +272,9 @@ public:
inline bool childrenCombineOpacity() const
{
- if (!children.size() || flags & QGraphicsItem::ItemDoesntPropagateOpacityToChildren)
+ if (!children.size())
+ return true;
+ if (flags & QGraphicsItem::ItemDoesntPropagateOpacityToChildren)
return false;
for (int i = 0; i < children.size(); ++i) {