don't rely on custom global object to get GC callback

Install custom ClientData on JSGlobalData instance instead.
Also some cleanups to avoid globalObject et al being accessed
directly.
Killed the proxying scheme employed in setGlobalObject() since it
didn't work; if you stored the original Global Object and replaced
it with another object, then added properties to the new object,
they would show up in the old object, too (because the old object
would always proxy to whatever the current Global Object was).

1 files changed, 1 insertions, 1 deletions

diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp
index 1366c3f..dbf290b 100644
--- a/src/script/api/qscriptvalueiterator.cpp
+++ b/src/script/api/qscriptvalueiterator.cpp
@@ -114,7 +114,7 @@ public:
         if (propertyNames != 0)
             return;
         QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(object.engine());
-        JSC::ExecState *exec = eng_p->globalObject->globalExec();
+        JSC::ExecState *exec = eng_p->globalExec();
         propertyNames = new JSC::PropertyNameArray(exec);
         JSC::asObject(QScriptValuePrivate::get(object)->jscValue)->getPropertyNames(exec, *propertyNames);
     }