Merge remote-tracking branch 'origin/dev' into wip/pointerhandler

Change-Id: Ie2894830470a69827d4ace3d8af9bee971e3fbd4

1 files changed, 3 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp
index cde2131aab..71f85c2d71 100644
--- a/src/qml/jsruntime/qv4string.cpp
+++ b/src/qml/jsruntime/qv4string.cpp
@@ -54,12 +54,12 @@ using namespace QV4;
 
 DEFINE_MANAGED_VTABLE(String);
 
-void String::markObjects(Heap::Base *that, ExecutionEngine *e)
+void String::markObjects(Heap::Base *that, MarkStack *markStack)
 {
     String::Data *s = static_cast<String::Data *>(that);
     if (s->largestSubLength) {
-        s->left->mark(e);
-        s->right->mark(e);
+        s->left->mark(markStack);
+        s->right->mark(markStack);
     }
 }