diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-26 12:35:45 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-26 12:35:45 (GMT) |
| commit | 7e30c92186878beb300a13093c3668ae8a10f2be (patch) | |
| tree | 313aa7f7a8345e65b7803bae1cb68ad866bdadbc /src/3rdparty/webkit/JavaScriptCore/runtime/JSByteArray.h | |
| parent | b98042831f4f6f6c5844965731b2dd64f27c076e (diff) | |
| parent | aeb4251c76560a070ce22320be00e860950b4668 (diff) | |
| download | Qt-7e30c92186878beb300a13093c3668ae8a10f2be.zip Qt-7e30c92186878beb300a13093c3668ae8a10f2be.tar.gz Qt-7e30c92186878beb300a13093c3668ae8a10f2be.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSByteArray.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSByteArray.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSByteArray.h b/src/3rdparty/webkit/JavaScriptCore/runtime/JSByteArray.h index 57374e0..c43c3ea 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSByteArray.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSByteArray.h @@ -81,7 +81,7 @@ namespace JSC { virtual void put(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual void put(JSC::ExecState*, unsigned propertyName, JSC::JSValue); - virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&); + virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&, unsigned listedAttributes = Structure::Prototype); virtual const ClassInfo* classInfo() const { return m_classInfo; } static const ClassInfo s_defaultInfo; |