aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2013-08-21 12:30:46 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-21 15:55:32 +0200
commit4f35280bd039c2d2f0c53e936740440f1d887916 (patch)
treeab5f685fc7c5571552f9d6356733c541bbb2ae82 /src/qml/qml
parentfe0b3bb05ffb80579233e367f94078da8abd935d (diff)
Debugger: Fix crash when app exits while debugging
Make sure we don't access an already deleted v8engine any more. Task-number: QTBUG-33100 Change-Id: Ic517577ae30b41375cbf9f787cfe0a29121171e2 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Diffstat (limited to 'src/qml/qml')
-rw-r--r--src/qml/qml/qqmlengine.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index fef3dd21fe..cc49b4f0a2 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -749,7 +749,7 @@ void QQmlEnginePrivate::init()
QQmlEngineDebugService::isDebuggingEnabled()) {
isDebugging = true;
QQmlEngineDebugService::instance()->addEngine(q);
- QV8DebugService::initialize(v8engine());
+ QV8DebugService::addEngine(v8engine());
QV8ProfilerService::initialize();
QQmlProfilerService::initialize();
QDebugMessageService::instance();
@@ -838,6 +838,7 @@ QQmlEngine::~QQmlEngine()
Q_D(QQmlEngine);
if (d->isDebugging) {
QQmlEngineDebugService::instance()->remEngine(this);
+ QV8DebugService::removeEngine(handle());
}
// Emit onDestruction signals for the root context before