diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-07 07:21:30 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-07 07:21:30 (GMT) |
| commit | a3c1b0703575ed5fc364011c73dc104ecdb8ef0c (patch) | |
| tree | 4e57559b1753c7b1eb3f375aa59eee6ea1108f70 /src/script/bridge/qscriptobject.cpp | |
| parent | f9ffe24a87d67f39bb877224f7e2b6f7b3ad6c02 (diff) | |
| parent | 7a5bca82738e6b782047e50a813972eccd928307 (diff) | |
| download | Qt-a3c1b0703575ed5fc364011c73dc104ecdb8ef0c.zip Qt-a3c1b0703575ed5fc364011c73dc104ecdb8ef0c.tar.gz Qt-a3c1b0703575ed5fc364011c73dc104ecdb8ef0c.tar.bz2 | |
Merge branch '4.6' of ../../4.6 into 4.6
Conflicts:
examples/multimedia/audiodevices/audiodevices.cpp
Diffstat (limited to 'src/script/bridge/qscriptobject.cpp')
| -rw-r--r-- | src/script/bridge/qscriptobject.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/script/bridge/qscriptobject.cpp b/src/script/bridge/qscriptobject.cpp index 2d71c43..6942eb6 100644 --- a/src/script/bridge/qscriptobject.cpp +++ b/src/script/bridge/qscriptobject.cpp @@ -61,6 +61,15 @@ bool QScriptObject::getOwnPropertySlot(JSC::ExecState* exec, return d->delegate->getOwnPropertySlot(this, exec, propertyName, slot); } +bool QScriptObject::getOwnPropertyDescriptor(JSC::ExecState* exec, + const JSC::Identifier& propertyName, + JSC::PropertyDescriptor& descriptor) +{ + if (!d || !d->delegate) + return JSC::JSObject::getOwnPropertyDescriptor(exec, propertyName, descriptor); + return d->delegate->getOwnPropertyDescriptor(this, exec, propertyName, descriptor); +} + void QScriptObject::put(JSC::ExecState* exec, const JSC::Identifier& propertyName, JSC::JSValue value, JSC::PutPropertySlot& slot) { @@ -164,6 +173,14 @@ bool QScriptObjectDelegate::getOwnPropertySlot(QScriptObject* object, JSC::ExecS return object->JSC::JSObject::getOwnPropertySlot(exec, propertyName, slot); } +bool QScriptObjectDelegate::getOwnPropertyDescriptor(QScriptObject* object, JSC::ExecState* exec, + const JSC::Identifier& propertyName, + JSC::PropertyDescriptor& descriptor) +{ + return object->JSC::JSObject::getOwnPropertyDescriptor(exec, propertyName, descriptor); +} + + void QScriptObjectDelegate::put(QScriptObject* object, JSC::ExecState* exec, const JSC::Identifier& propertyName, JSC::JSValue value, JSC::PutPropertySlot& slot) |