From 32cb245883db9d66a42d5b00cfe59a885ef354da Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Tue, 6 Mar 2012 09:10:57 +0100
Subject: [PATCH] QmlCppDebugger: Quit the qml debugger before the connection
already closed
Change-Id: If8eddda3f99b6aef501f43f05b6667c250ab7659
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
---
src/plugins/debugger/qml/qmlcppengine.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 5a7159996f8..2ee94881b66 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -660,6 +660,7 @@ void QmlCppEngine::slaveEngineStateChanged
case InferiorExitOk: {
// InferiorExitOk will be called through notifyInferiorExited
// when InferiorShutDownOk is reached
+ qmlEngine()->quitDebugger();
break;
}
case InferiorShutdownRequested: {
@@ -687,17 +688,16 @@ void QmlCppEngine::slaveEngineStateChanged
case EngineShutdownRequested: {
// set by queueShutdownEngine()
QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
+ qmlEngine()->quitDebugger();
break;
}
case EngineShutdownFailed: {
QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
- qmlEngine()->quitDebugger();
notifyEngineShutdownFailed();
break;
}
case EngineShutdownOk: {
QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
- qmlEngine()->quitDebugger();
notifyEngineShutdownOk();
break;
}
--
GitLab