Merge branch 'master' into v8-clean

Conflicts:
	src/declarative/qml/qdeclarativevme.cpp

Change-Id: I0bbc12c06d40c70433730cb33c4e9b461520263f

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/auto/declarative/nodes/tst_nodestest.cpp b/tests/auto/declarative/nodes/tst_nodestest.cpp
index acfc02c844..b9f276cee9 100644
--- a/tests/auto/declarative/nodes/tst_nodestest.cpp
+++ b/tests/auto/declarative/nodes/tst_nodestest.cpp
@@ -196,14 +196,14 @@ public:
 
         if (renderer->rootNode()->parent()) {
             // Mark the root dirty to build a clean state from the root and down
-            renderer->rootNode()->markDirty(QSGNode::DirtyAll);
+            renderer->rootNode()->markDirty(QSGNode::DirtyForceUpdate);
         }
 
         renderer->renderScene();
 
         if (renderer->rootNode()->parent()) {
             // Mark the parent of the root dirty to force the root and down to be updated.
-            renderer->rootNode()->parent()->markDirty(QSGNode::DirtyAll);
+            renderer->rootNode()->parent()->markDirty(QSGNode::DirtyForceUpdate);
         }
     }