diff options
author | David Boddie <david.boddie@nokia.com> | 2010-09-02 17:17:15 (GMT) |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2010-09-02 17:17:15 (GMT) |
commit | ca68786e62e0e645b692dc19a87b7dc3b2219ffd (patch) | |
tree | 5ca3034fea3566e136d893b9f16dc06db362096f /src/gui/graphicsview | |
parent | 63129c8bd21bfdc8110680296bb3bc1ab5e43343 (diff) | |
parent | 19beb3de012c4531dc69699bbb33f2cf1e86a84c (diff) | |
download | Qt-ca68786e62e0e645b692dc19a87b7dc3b2219ffd.zip Qt-ca68786e62e0e645b692dc19a87b7dc3b2219ffd.tar.gz Qt-ca68786e62e0e645b692dc19a87b7dc3b2219ffd.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/graphicsview')
-rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 72ddcef..7a5b8de 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -5666,9 +5666,6 @@ void QGraphicsItem::update(const QRectF &rect) return; } - if (d_ptr->discardUpdateRequest()) - return; - if (d_ptr->scene) d_ptr->scene->d_func()->markDirty(this, rect); } |