diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-22 22:48:38 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-05-23 13:11:44 +0200 |
| commit | 6dee93c6492de34cb18f57e73d2b2044fa1a4396 (patch) | |
| tree | decb32e925d2cc76f0a3feea554d025f0a28954d /src/qml/qml/v8/qv8qobjectwrapper.cpp | |
| parent | 939465f65549953c77ffd3ea11df6d165a8289e0 (diff) | |
Fix failing assertion in QObject bindings when catching exception
Add missing accept() to ensure the context is unwound correctly.
Change-Id: I42f9d17c8df25beb151675377d4395f1e2b35eef
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8qobjectwrapper.cpp')
| -rw-r--r-- | src/qml/qml/v8/qv8qobjectwrapper.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp index 0a3bd0b349..6f5cc97b55 100644 --- a/src/qml/qml/v8/qv8qobjectwrapper.cpp +++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp @@ -1324,6 +1324,7 @@ int QV8QObjectConnectionList::qt_metacall(QMetaObject::Call method, int index, v try { f->call(v4->current, connection.thisObject.isEmpty() ? engine->global() : connection.thisObject.value(), args.data(), argCount); } catch (QV4::Exception &e) { + e.accept(ctx); QQmlError error; QQmlExpressionPrivate::exceptionToError(e, error); if (error.description().isEmpty()) |