diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-06-29 16:23:23 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-06-29 16:23:23 (GMT) |
| commit | 939e59f7f3cd23ab429c48d1be8f3d98f94962ad (patch) | |
| tree | ed9cfff0efd64a6d015ff4295c511e455b4dcd48 /src/script/bridge/qscriptqobject.cpp | |
| parent | 4c248e463c1748db0afbdb7db32a1b512a11bf44 (diff) | |
| download | Qt-939e59f7f3cd23ab429c48d1be8f3d98f94962ad.zip Qt-939e59f7f3cd23ab429c48d1be8f3d98f94962ad.tar.gz Qt-939e59f7f3cd23ab429c48d1be8f3d98f94962ad.tar.bz2 | |
make part of test not assert
Diffstat (limited to 'src/script/bridge/qscriptqobject.cpp')
| -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 de6eecf..da301a0 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -1443,6 +1443,8 @@ void QObjectConnectionManager::execute(int slotIndex, void **argv) JSC::CallData callData; JSC::CallType callType = slot.getCallData(callData); if (callType == JSC::CallTypeJS) { + if (exec->hadException()) + exec->clearException(); // ### otherwise JSC asserts (void)JSC::asFunction(slot)->call(exec, thisObject, jscArgs); } else if (callType == JSC::CallTypeHost) { (void)callData.native.function(exec, JSC::asObject(slot), thisObject, jscArgs); |