From bea8a19742ed1decbd63464e36e57980fbde7016 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Thu, 28 May 2009 22:55:49 +0200
Subject: fix a small logic bug in childrenCombineOpacity

Regression introduced during refactoring earlier today.
---
 src/gui/graphicsview/qgraphicsitem_p.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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) {
-- 
cgit v0.12