diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-04 14:47:08 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-04 14:48:15 (GMT) |
| commit | 28e8cb97ed2813a6baac36f1795b3ba9c71892c2 (patch) | |
| tree | 2110883da644ecb4e8694414dd38319dc42c2393 /src/script/api/qscriptengine.cpp | |
| parent | 394f62d779e6e120ce2fc19bd61ec64bd29a87a9 (diff) | |
| download | Qt-28e8cb97ed2813a6baac36f1795b3ba9c71892c2.zip Qt-28e8cb97ed2813a6baac36f1795b3ba9c71892c2.tar.gz Qt-28e8cb97ed2813a6baac36f1795b3ba9c71892c2.tar.bz2 | |
adapt to commit 014c4c63066fd3920594e6a58b02f314b5c88cdf
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index bebb972..088cf77 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -365,7 +365,8 @@ public: virtual void put(JSC::ExecState* exec, const JSC::Identifier& propertyName, JSC::JSValue, JSC::PutPropertySlot&); virtual bool deleteProperty(JSC::ExecState*, - const JSC::Identifier& propertyName); + const JSC::Identifier& propertyName, + bool checkDontDelete = true); virtual bool getPropertyAttributes(JSC::ExecState*, const JSC::Identifier&, unsigned&) const; virtual void getPropertyNames(JSC::ExecState*, JSC::PropertyNameArray&, bool includeNonEnumerable = false); @@ -400,8 +401,8 @@ public: JSC::JSValue value, JSC::PutPropertySlot& slot) { originalGlobalObject->JSC::JSGlobalObject::put(exec, propertyName, value, slot); } virtual bool deleteProperty(JSC::ExecState* exec, - const JSC::Identifier& propertyName) - { return originalGlobalObject->JSC::JSGlobalObject::deleteProperty(exec, propertyName); } + const JSC::Identifier& propertyName, bool checkDontDelete = true) + { return originalGlobalObject->JSC::JSGlobalObject::deleteProperty(exec, propertyName, checkDontDelete); } virtual bool getPropertyAttributes(JSC::ExecState* exec, const JSC::Identifier& propertyName, unsigned& attributes) const { return originalGlobalObject->JSC::JSGlobalObject::getPropertyAttributes(exec, propertyName, attributes); } @@ -727,11 +728,11 @@ void GlobalObject::put(JSC::ExecState* exec, const JSC::Identifier& propertyName } bool GlobalObject::deleteProperty(JSC::ExecState* exec, - const JSC::Identifier& propertyName) + const JSC::Identifier& propertyName, bool checkDontDelete) { if (customGlobalObject) - return customGlobalObject->deleteProperty(exec, propertyName); - return JSC::JSGlobalObject::deleteProperty(exec, propertyName); + return customGlobalObject->deleteProperty(exec, propertyName, checkDontDelete); + return JSC::JSGlobalObject::deleteProperty(exec, propertyName, checkDontDelete); } bool GlobalObject::getPropertyAttributes(JSC::ExecState* exec, const JSC::Identifier& propertyName, |