From f3d91c243837a3adf473f951819df82ed86c669a Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@jollamobile.com>
Date: Thu, 31 Jul 2014 12:21:16 +0200
Subject: Fix assertion: ASSERT: "hasException" in file
 jsruntime/qv4engine.cpp, line 933

This was seemingly tripped by trying to catch the exception twice: once with
catchException and once with catchExceptionAsQmlError.

Change-Id: I7176d56fe6e6f748e80d0894e314ed2b8f6e751d
Done-by: Mikko Harju <mikko.harju@jollamobile.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
---
 src/qml/qml/qqmlcomponent.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index 68f950d840..b5af502a10 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1540,7 +1540,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(v8->engine()), error);
         }
-- 
cgit v1.2.3