summaryrefslogtreecommitdiffstats
path: root/src/script/bridge/qscriptqobject.cpp
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-08-04 14:47:08 (GMT)
committerKent Hansen <khansen@trolltech.com>2009-08-04 14:48:15 (GMT)
commit28e8cb97ed2813a6baac36f1795b3ba9c71892c2 (patch)
tree2110883da644ecb4e8694414dd38319dc42c2393 /src/script/bridge/qscriptqobject.cpp
parent394f62d779e6e120ce2fc19bd61ec64bd29a87a9 (diff)
downloadQt-28e8cb97ed2813a6baac36f1795b3ba9c71892c2.zip
Qt-28e8cb97ed2813a6baac36f1795b3ba9c71892c2.tar.gz
Qt-28e8cb97ed2813a6baac36f1795b3ba9c71892c2.tar.bz2
adapt to commit 014c4c63066fd3920594e6a58b02f314b5c88cdf
Diffstat (limited to 'src/script/bridge/qscriptqobject.cpp')
-rw-r--r--src/script/bridge/qscriptqobject.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp
index 4e9b74b..324b149 100644
--- a/src/script/bridge/qscriptqobject.cpp
+++ b/src/script/bridge/qscriptqobject.cpp
@@ -1368,7 +1368,8 @@ void QObjectDelegate::put(QScriptObject *object, JSC::ExecState* exec,
}
bool QObjectDelegate::deleteProperty(QScriptObject *object, JSC::ExecState *exec,
- const JSC::Identifier& propertyName)
+ const JSC::Identifier& propertyName,
+ bool checkDontDelete)
{
QByteArray name = qtStringFromJSCUString(propertyName.ustring()).toLatin1();
QObject *qobject = data->value;
@@ -1407,7 +1408,7 @@ bool QObjectDelegate::deleteProperty(QScriptObject *object, JSC::ExecState *exec
return true;
}
- return QScriptObjectDelegate::deleteProperty(object, exec, propertyName);
+ return QScriptObjectDelegate::deleteProperty(object, exec, propertyName, checkDontDelete);
}
bool QObjectDelegate::getPropertyAttributes(const QScriptObject *object,
@@ -1723,7 +1724,8 @@ void QMetaObjectWrapperObject::put(JSC::ExecState* exec, const JSC::Identifier&
}
bool QMetaObjectWrapperObject::deleteProperty(
- JSC::ExecState *exec, const JSC::Identifier& propertyName)
+ JSC::ExecState *exec, const JSC::Identifier& propertyName,
+ bool checkDontDelete)
{
if (propertyName == exec->propertyNames().prototype)
return false;
@@ -1738,7 +1740,7 @@ bool QMetaObjectWrapperObject::deleteProperty(
}
}
}
- return JSC::JSObject::deleteProperty(exec, propertyName);
+ return JSC::JSObject::deleteProperty(exec, propertyName, checkDontDelete);
}
bool QMetaObjectWrapperObject::getPropertyAttributes(JSC::ExecState *exec,