summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLeonardo Sobral Cunha <leo.cunha@nokia.com>2009-05-27 13:03:00 (GMT)
committerLeonardo Sobral Cunha <leo.cunha@nokia.com>2009-05-27 13:03:00 (GMT)
commit5675d15eebd76fde43bc9305347c3b7833a7d893 (patch)
tree30059b7bab3a6c73f6e3ee2562ec16eb01cee754 /src
parent54972a8a888ab73b7492dd0115327063bfdaff85 (diff)
downloadQt-5675d15eebd76fde43bc9305347c3b7833a7d893.zip
Qt-5675d15eebd76fde43bc9305347c3b7833a7d893.tar.gz
Qt-5675d15eebd76fde43bc9305347c3b7833a7d893.tar.bz2
Fixes for merge-request #407
Removed unused line and added task number to autotest.
Diffstat (limited to 'src')
-rw-r--r--src/gui/graphicsview/qgraphicsitem.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index b6a7386..e8ace65 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -1522,10 +1522,9 @@ void QGraphicsItemPrivate::setVisibleHelper(bool newVisible, bool explicitly, bo
if (visible == quint32(newVisible))
return;
- QGraphicsItem *parent(q_ptr->parentItem());
- if (parent && newVisible && !parent->d_ptr->visible) {
+ // Don't show child if parent is not visible
+ if (parent && newVisible && !parent->d_ptr->visible)
return;
- }
// Modify the property.
const QVariant newVisibleVariant(q_ptr->itemChange(QGraphicsItem::ItemVisibleChange,