diff options
| author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-08-08 11:05:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-08-08 11:05:12 +0200 |
| commit | b4b27168ac03d61f6dfa146c9262df44097eadfe (patch) | |
| tree | 4fbfa2d3b58fa267ba8c2dbc4c7d5f077cdbc767 /src/qml/qml | |
| parent | 24581b838a5cc1dd5bd0f99cc02ed1aac9771de0 (diff) | |
| parent | 9737b35ac0638dd301b670e940f4e424aab4b4f3 (diff) | |
Merge "Merge branch '5.3' into dev" into refs/staging/dev
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 616f54d174..e087785901 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1542,7 +1542,6 @@ void QmlIncubatorObject::statusChanged(QQmlIncubator::Status s) callData->args[0] = QV4::Primitive::fromUInt32(s); f->call(callData); if (scope.hasException()) { - ctx->catchException(); QQmlError error = QV4::ExecutionEngine::catchExceptionAsQmlError(ctx); QQmlEnginePrivate::warning(QQmlEnginePrivate::get(d()->v8->engine()), error); } |