1 files changed, 17 insertions, 9 deletions
diff --git a/src/qml/jsruntime/qv4lookup.cpp b/src/qml/jsruntime/qv4lookup.cpp
index 46e47307ef..84755a6402 100644
--- a/src/qml/jsruntime/qv4lookup.cpp
+++ b/src/qml/jsruntime/qv4lookup.cpp
@@ -306,7 +306,7 @@ ReturnedValue Lookup::getterTwoClasses(Lookup *l, ExecutionEngine *engine, const
             ReturnedValue v = o->getLookup(l);
             Lookup l2 = *l;
 
-            if (l2.getter == Lookup::getter0 || l2.getter == Lookup::getter1) {
+            if (l->index != UINT_MAX && (l2.getter == Lookup::getter0 || l2.getter == Lookup::getter1)) {
                 // if we have a getter0, make sure it comes first
                 if (l2.getter == Lookup::getter0)
                     qSwap(l1, l2);
@@ -451,7 +451,8 @@ ReturnedValue Lookup::getterAccessor0(Lookup *l, ExecutionEngine *engine, const
 
             ScopedCallData callData(scope, 0);
             callData->thisObject = object;
-            return getter->call(callData);
+            getter->call(scope, callData);
+            return scope.result.asReturnedValue();
         }
     }
     l->getter = getterFallback;
@@ -473,7 +474,8 @@ ReturnedValue Lookup::getterAccessor1(Lookup *l, ExecutionEngine *engine, const
 
             ScopedCallData callData(scope, 0);
             callData->thisObject = object;
-            return getter->call(callData);
+            getter->call(scope, callData);
+            return scope.result.asReturnedValue();
         }
     }
     l->getter = getterFallback;
@@ -498,7 +500,8 @@ ReturnedValue Lookup::getterAccessor2(Lookup *l, ExecutionEngine *engine, const
 
                     ScopedCallData callData(scope, 0);
                     callData->thisObject = object;
-                    return getter->call(callData);
+                    getter->call(scope, callData);
+                    return scope.result.asReturnedValue();
                 }
             }
         }
@@ -542,7 +545,8 @@ ReturnedValue Lookup::primitiveGetterAccessor0(Lookup *l, ExecutionEngine *engin
 
             ScopedCallData callData(scope, 0);
             callData->thisObject = object;
-            return getter->call(callData);
+            getter->call(scope, callData);
+            return scope.result.asReturnedValue();
         }
     }
     l->getter = getterGeneric;
@@ -562,7 +566,8 @@ ReturnedValue Lookup::primitiveGetterAccessor1(Lookup *l, ExecutionEngine *engin
 
             ScopedCallData callData(scope, 0);
             callData->thisObject = object;
-            return getter->call(callData);
+            getter->call(scope, callData);
+            return scope.result.asReturnedValue();
         }
     }
     l->getter = getterGeneric;
@@ -665,7 +670,8 @@ ReturnedValue Lookup::globalGetterAccessor0(Lookup *l, ExecutionEngine *engine)
 
         ScopedCallData callData(scope, 0);
         callData->thisObject = Primitive::undefinedValue();
-        return getter->call(callData);
+        getter->call(scope, callData);
+        return scope.result.asReturnedValue();
     }
     l->globalGetter = globalGetterGeneric;
     return globalGetterGeneric(l, engine);
@@ -683,7 +689,8 @@ ReturnedValue Lookup::globalGetterAccessor1(Lookup *l, ExecutionEngine *engine)
 
         ScopedCallData callData(scope, 0);
         callData->thisObject = Primitive::undefinedValue();
-        return getter->call(callData);
+        getter->call(scope, callData);
+        return scope.result.asReturnedValue();
     }
     l->globalGetter = globalGetterGeneric;
     return globalGetterGeneric(l, engine);
@@ -704,7 +711,8 @@ ReturnedValue Lookup::globalGetterAccessor2(Lookup *l, ExecutionEngine *engine)
 
                 ScopedCallData callData(scope, 0);
                 callData->thisObject = Primitive::undefinedValue();
-                return getter->call(callData);
+                getter->call(scope, callData);
+                return scope.result.asReturnedValue();
             }
         }
     }