diff options
| author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-08-07 11:31:23 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-08-07 11:31:23 +0200 |
| commit | 9737b35ac0638dd301b670e940f4e424aab4b4f3 (patch) | |
| tree | 2f0225f0f2b05d8422126b2b91a7f0fc73e93700 /src/qml/qml/qqmlcomponent.cpp | |
| parent | 0a43c561891a46477c4e78f6a6d05fd9731ebb04 (diff) | |
| parent | 3f5141e5b7227630ca89329a92b6ebddbcb1b7a5 (diff) | |
Merge branch '5.3' into dev
Conflicts:
src/quick/items/context2d/qquickcontext2d.cpp
src/quick/items/context2d/qquickcontext2dtexture.cpp
Change-Id: I1a9b911b3a92333a5dddbaf43275f71bad2006f0
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
| -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); } |