diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-06 23:56:02 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-06 23:56:02 (GMT) |
| commit | b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7 (patch) | |
| tree | ac169cc9df2ff639e81b15dcaf268ed09d2e16cb /src/script/api/qscriptvalue.cpp | |
| parent | 5584feca163e91588f08b0aa1f3ae2817cd90823 (diff) | |
| parent | d7fe798e022884dcbc58844e686a7d4fd39cf027 (diff) | |
| download | Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.zip Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.tar.gz Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/script/api/qscriptvalue.cpp')
| -rw-r--r-- | src/script/api/qscriptvalue.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp index f2716e4..92c987c 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -1738,7 +1738,7 @@ QScriptValue QScriptValue::property(quint32 arrayIndex, void QScriptValue::setProperty(quint32 arrayIndex, const QScriptValue &value, const PropertyFlags &flags) { - Q_D(const QScriptValue); + Q_D(QScriptValue); if (!d || !d->isObject()) return; if (value.engine() && (value.engine() != engine())) { @@ -1752,7 +1752,9 @@ void QScriptValue::setProperty(quint32 arrayIndex, const QScriptValue &value, JSC::asObject(d->jscValue)->deleteProperty(exec, arrayIndex, /*checkDontDelete=*/false); } else { if ((flags & QScriptValue::PropertyGetter) || (flags & QScriptValue::PropertySetter)) { - Q_ASSERT_X(false, Q_FUNC_INFO, "property getters and setters not implemented"); + // fall back to string-based setProperty(), since there is no + // JSC::JSObject::defineGetter(unsigned) + d->setProperty(JSC::Identifier::from(exec, arrayIndex), value, flags); } else { if (flags != QScriptValue::KeepExistingFlags) { // if (JSC::asObject(d->jscValue)->hasOwnProperty(exec, arrayIndex)) |