diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-05-08 07:04:37 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-05-08 07:04:37 (GMT) |
| commit | 639004cbf1e9d3f94512d9a07e56aeafef4d93b9 (patch) | |
| tree | 175c52791fcc0d7bd2c1ef517b705b3d2850fc69 /src/gui/graphicsview/qgraphicsitem.cpp | |
| parent | 9dcc7f9fea95d41f82fdde700f1a17da81257451 (diff) | |
| parent | 15de11bfcd2907e587dff41013fd39b62f0ca869 (diff) | |
| download | Qt-639004cbf1e9d3f94512d9a07e56aeafef4d93b9.zip Qt-639004cbf1e9d3f94512d9a07e56aeafef4d93b9.tar.gz Qt-639004cbf1e9d3f94512d9a07e56aeafef4d93b9.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index bc9b2fa..ce635d6 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1268,8 +1268,8 @@ void QGraphicsItem::setFlags(GraphicsItemFlags flags) return; // Flags that alter the geometry of the item (or its children). - int geomChangeFlagsMask = (ItemClipsChildrenToShape | ItemClipsToShape | ItemIgnoresTransformations); - bool fullUpdate = (flags & geomChangeFlagsMask) != (d_ptr->flags & geomChangeFlagsMask); + const quint32 geomChangeFlagsMask = (ItemClipsChildrenToShape | ItemClipsToShape | ItemIgnoresTransformations); + bool fullUpdate = (quint32(flags) & geomChangeFlagsMask) != (d_ptr->flags & geomChangeFlagsMask); if (fullUpdate) d_ptr->fullUpdateHelper(false, true); |