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/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.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/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.cpp b/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.cpp index 7a68d7d..5cc9a9f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/debugger/DebuggerActivation.cpp @@ -81,14 +81,14 @@ bool DebuggerActivation::getPropertyAttributes(JSC::ExecState* exec, const Ident return m_activation->getPropertyAttributes(exec, propertyName, attributes); } -void DebuggerActivation::defineGetter(ExecState* exec, const Identifier& propertyName, JSObject* getterFunction) +void DebuggerActivation::defineGetter(ExecState* exec, const Identifier& propertyName, JSObject* getterFunction, unsigned attributes) { - m_activation->defineGetter(exec, propertyName, getterFunction); + m_activation->defineGetter(exec, propertyName, getterFunction, attributes); } -void DebuggerActivation::defineSetter(ExecState* exec, const Identifier& propertyName, JSObject* setterFunction) +void DebuggerActivation::defineSetter(ExecState* exec, const Identifier& propertyName, JSObject* setterFunction, unsigned attributes) { - m_activation->defineSetter(exec, propertyName, setterFunction); + m_activation->defineSetter(exec, propertyName, setterFunction, attributes); } JSValue DebuggerActivation::lookupGetter(ExecState* exec, const Identifier& propertyName) |