diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-25 02:28:57 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-25 02:28:57 (GMT) |
| commit | b768917f043bd78ac8af125c1993f05776a052b7 (patch) | |
| tree | 754a0eba403a781332f28da087c8493c82a57fd5 /src/script/api/qscriptvalueiterator.cpp | |
| parent | be63c460b84c694dbae10494e491256bd53a5c0b (diff) | |
| parent | fafec8f2363fd7ab3ce5b81a66cc82001a58c8ed (diff) | |
| download | Qt-b768917f043bd78ac8af125c1993f05776a052b7.zip Qt-b768917f043bd78ac8af125c1993f05776a052b7.tar.gz Qt-b768917f043bd78ac8af125c1993f05776a052b7.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/script/api/qscriptvalueiterator.cpp')
| -rw-r--r-- | src/script/api/qscriptvalueiterator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptvalueiterator.cpp b/src/script/api/qscriptvalueiterator.cpp index 5bba327..cf27af6 100644 --- a/src/script/api/qscriptvalueiterator.cpp +++ b/src/script/api/qscriptvalueiterator.cpp @@ -110,7 +110,7 @@ public: JSC::ExecState *exec = eng_p->globalExec(); JSC::PropertyNameArray propertyNamesArray(exec); propertyNamesArray.setShouldCache(false); - JSC::asObject(QScriptValuePrivate::get(object)->jscValue)->getPropertyNames(exec, propertyNamesArray, JSC::Structure::NonEnumerable); + JSC::asObject(QScriptValuePrivate::get(object)->jscValue)->getOwnPropertyNames(exec, propertyNamesArray, /*includeNonEnumerable=*/true); JSC::PropertyNameArray::const_iterator propertyNamesIt = propertyNamesArray.begin(); for(; propertyNamesIt != propertyNamesArray.end(); ++propertyNamesIt) { |