summaryrefslogtreecommitdiffstats
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:29:07 (GMT)
commit6e92cbd42ce7e68112de8bce8a0468532843a947 (patch)
tree1c7765f410d3c3244db4e2a9db0f5ac882e65329
parentf8f185b99a12e14374ce29501b8d13c5e3d125fd (diff)
downloadQt-6e92cbd42ce7e68112de8bce8a0468532843a947.zip
Qt-6e92cbd42ce7e68112de8bce8a0468532843a947.tar.gz
Qt-6e92cbd42ce7e68112de8bce8a0468532843a947.tar.bz2
fix a small logic bug in childrenCombineOpacity
Regression introduced during refactoring earlier today.
-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) {