diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-07-15 10:03:43 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-07-15 10:03:43 (GMT) |
| commit | c32c9c2d2b868cb34fb8917b25273eb52f2c9581 (patch) | |
| tree | 70cbc9833a86fe84c773b992fa4d52ecff9cdf99 /src/script/bridge | |
| parent | 25e41f5bbf3ad288a6b2f9eec0fbef7c5b171744 (diff) | |
| download | Qt-c32c9c2d2b868cb34fb8917b25273eb52f2c9581.zip Qt-c32c9c2d2b868cb34fb8917b25273eb52f2c9581.tar.gz Qt-c32c9c2d2b868cb34fb8917b25273eb52f2c9581.tar.bz2 | |
store error and return true when throwing in getOwnProperty()
Diffstat (limited to 'src/script/bridge')
| -rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index 4f19894..15d48c3 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -1136,8 +1136,8 @@ bool QObjectDelegate::getOwnPropertySlot(QScriptObject *object, JSC::ExecState * if (!qobject) { QString message = QString::fromLatin1("cannot access member `%0' of deleted QObject") .arg(QString::fromLatin1(name)); - JSC::throwError(exec, JSC::GeneralError, qtStringToJSCUString(message)); - return false; + slot.setValue(JSC::throwError(exec, JSC::GeneralError, qtStringToJSCUString(message))); + return true; } const QMetaObject *meta = qobject->metaObject(); |