1 files changed, 9 insertions, 8 deletions

diff --git a/src/qml/jsruntime/qv4context_p.h b/src/qml/jsruntime/qv4context_p.h
index 8392dd836d..c35263ba7e 100644
--- a/src/qml/jsruntime/qv4context_p.h
+++ b/src/qml/jsruntime/qv4context_p.h
@@ -45,6 +45,7 @@ struct CompilationUnit;
 struct Function;
 }
 
+struct Identifier;
 struct CallContext;
 struct CatchContext;
 struct WithContext;
@@ -84,8 +85,8 @@ struct ExecutionContext : Base {
     CallData *callData;
 
     ExecutionEngine *engine;
-    ExecutionContext *parent;
-    ExecutionContext *outer;
+    Pointer<ExecutionContext> parent;
+    Pointer<ExecutionContext> outer;
     Lookup *lookups;
     CompiledData::CompilationUnit *compilationUnit;
 
@@ -104,25 +105,25 @@ struct CallContext : ExecutionContext {
     }
     CallContext(ExecutionEngine *engine, QV4::Object *qml, QV4::FunctionObject *function);
 
-    FunctionObject *function;
+    Pointer<FunctionObject> function;
     Value *locals;
-    Object *activation;
+    Pointer<Object> activation;
 };
 
 struct GlobalContext : ExecutionContext {
     GlobalContext(ExecutionEngine *engine);
-    Object *global;
+    Pointer<Object> global;
 };
 
 struct CatchContext : ExecutionContext {
     CatchContext(ExecutionEngine *engine, QV4::String *exceptionVarName, const Value &exceptionValue);
-    StringValue exceptionVarName;
+    Pointer<String> exceptionVarName;
     Value exceptionValue;
 };
 
 struct WithContext : ExecutionContext {
     WithContext(ExecutionEngine *engine, QV4::Object *with);
-    Object *withObject;
+    Pointer<Object> withObject;
 };
 
 
@@ -160,7 +161,7 @@ struct Q_QML_EXPORT ExecutionContext : public Managed
 
     static void markObjects(Heap::Base *m, ExecutionEngine *e);
 
-    const Value &thisObject() const {
+    Value &thisObject() const {
         return d()->callData->thisObject;
     }
     int argc() const {