diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-07-15 08:08:59 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-07-15 08:08:59 (GMT) |
| commit | 58dbd9c74f398b030c44ec2bc6af99af2edd913a (patch) | |
| tree | 1659379c0889fe89a981682625528eb922256b64 /src/script/bridge | |
| parent | 38615f6bb0c0788ef61b3dd48490751d8a489327 (diff) | |
| download | Qt-58dbd9c74f398b030c44ec2bc6af99af2edd913a.zip Qt-58dbd9c74f398b030c44ec2bc6af99af2edd913a.tar.gz Qt-58dbd9c74f398b030c44ec2bc6af99af2edd913a.tar.bz2 | |
clear script exceptions when executing Qt methods
The argument conversion logic checks for exceptions after
attempting to convert each argument; this requires that there
is initially no exception, otherwise it's going to bail out
even if the conversion itself succeeded.
Diffstat (limited to 'src/script/bridge')
| -rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index ff58102..0f54ec9 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -496,6 +496,8 @@ JSC::JSValue QtFunction::execute(JSC::ExecState *exec, JSC::JSValue thisValue, thisQObject = qobj; } + exec->clearException(); + QByteArray funName; QScriptMetaMethod chosenMethod; int chosenIndex = -1; |