summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2009-06-05 10:54:04 (GMT)
committerAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2009-06-09 07:35:53 (GMT)
commite83cc0aca3bab0d37c4d0679319017f4cfeacfe0 (patch)
treeaec666cf0e6b4f611515aabf841f3b07f370dd76 /src
parentf31b4a7163cee11c306e9f4fcaab094d9c38cb68 (diff)
downloadQt-e83cc0aca3bab0d37c4d0679319017f4cfeacfe0.zip
Qt-e83cc0aca3bab0d37c4d0679319017f4cfeacfe0.tar.gz
Qt-e83cc0aca3bab0d37c4d0679319017f4cfeacfe0.tar.bz2
Fix warning.
Diffstat (limited to 'src')
-rw-r--r--src/gui/graphicsview/qgraphicsscene.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index de9d865..7bfc032 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -5202,8 +5202,8 @@ void QGraphicsScenePrivate::drawSubtreeRecursive(QGraphicsItem *item, QPainter *
bool childClip = (item && (item->d_ptr->flags & QGraphicsItem::ItemClipsChildrenToShape));
bool dontDrawItem = !item || viewBoundingRect.isEmpty();
bool dontDrawChildren = item && dontDrawItem && childClip;
- childClip &= !dontDrawChildren & !children->isEmpty();
- if (item && (item->d_ptr->flags & QGraphicsItem::ItemHasNoContents) || invisibleButChildIgnoresParentOpacity)
+ childClip &= !dontDrawChildren && !children->isEmpty();
+ if (item && ((item->d_ptr->flags & QGraphicsItem::ItemHasNoContents) || invisibleButChildIgnoresParentOpacity))
dontDrawItem = true;
// Clip children.