diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2011-06-23 14:13:24 +0200 |
|---|---|---|
| committer | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2011-06-23 14:53:32 +0200 |
| commit | a9853d2ffe177bf98eb7610b58bb1bbb44743510 (patch) | |
| tree | 7923f9359306bd54c14dde5673d33fce154ba6ed /src/declarative/scenegraph | |
| parent | 098b7fb0ac84dbe65a8861cce76e036f0b9198d6 (diff) | |
Updated tst_nodestest to use the DirtyForceUpdate flag.
Changed test to use DirtyForceUpdate instead of DirtyAll, and
removed DirtyRenderOrder and DirtyAll enums which should not
be used.
Diffstat (limited to 'src/declarative/scenegraph')
| -rw-r--r-- | src/declarative/scenegraph/coreapi/qsgnode.cpp | 4 | ||||
| -rw-r--r-- | src/declarative/scenegraph/coreapi/qsgnode.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/declarative/scenegraph/coreapi/qsgnode.cpp b/src/declarative/scenegraph/coreapi/qsgnode.cpp index bfe17ca72b..b295d25b70 100644 --- a/src/declarative/scenegraph/coreapi/qsgnode.cpp +++ b/src/declarative/scenegraph/coreapi/qsgnode.cpp @@ -458,9 +458,9 @@ void QSGNode::markDirty(DirtyFlags flags) int geometryCountDiff = 0; if (flags & DirtyNodeAdded) - geometryCountDiff = m_subtreeGeometryCount; + geometryCountDiff += m_subtreeGeometryCount; if (flags & DirtyNodeRemoved) - geometryCountDiff = -m_subtreeGeometryCount; + geometryCountDiff -= m_subtreeGeometryCount; QSGNode *p = m_parent; while (p) { diff --git a/src/declarative/scenegraph/coreapi/qsgnode.h b/src/declarative/scenegraph/coreapi/qsgnode.h index cee6b76869..80def63f21 100644 --- a/src/declarative/scenegraph/coreapi/qsgnode.h +++ b/src/declarative/scenegraph/coreapi/qsgnode.h @@ -82,11 +82,9 @@ public: DirtyNodeAdded = 0x0004, DirtyNodeRemoved = 0x0008, DirtyGeometry = 0x0010, - DirtyRenderOrder = 0x0020, DirtyMaterial = 0x0040, DirtyOpacity = 0x0080, DirtyForceUpdate = 0x0100, - DirtyAll = 0xffff, DirtyPropagationMask = DirtyMatrix | DirtyClipList |