diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-03-24 15:20:55 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-03-24 15:20:55 (GMT) |
| commit | 6c8c62f470e31ff2f74e2a5d3ba71d36da5f6d77 (patch) | |
| tree | c93d39ffb5fadb25851eb52cb3974095ecbccfea /src/script/api/qscriptvalueiterator.cpp | |
| parent | 47efbddaa17b9c898eb406b8b39627f78b3c2ecf (diff) | |
| parent | 26b572903a800163972817cd717b5df454b96eb2 (diff) | |
| download | Qt-6c8c62f470e31ff2f74e2a5d3ba71d36da5f6d77.zip Qt-6c8c62f470e31ff2f74e2a5d3ba71d36da5f6d77.tar.gz Qt-6c8c62f470e31ff2f74e2a5d3ba71d36da5f6d77.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/script/api/qscriptvalueiterator.cpp')
| -rw-r--r-- | src/script/api/qscriptvalueiterator.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp index 5c1e6f2..7fd7093 100644 --- a/src/script/api/qscriptvalueiterator.cpp +++ b/src/script/api/qscriptvalueiterator.cpp @@ -100,6 +100,7 @@ public: if (initialized) return; QScriptEnginePrivate *eng_p = engine(); + QScript::APIShim shim(eng_p); JSC::ExecState *exec = eng_p->globalExec(); JSC::PropertyNameArray propertyNamesArray(exec); JSC::asObject(object()->jscValue)->getOwnPropertyNames(exec, propertyNamesArray, JSC::IncludeDontEnumProperties); |