From d75239aeab027394c0f46fbfe0270487282daf94 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Tue, 10 Aug 2010 14:42:44 +0200
Subject: [PATCH] QML Debugger: fix the fact that the qmlobserver would only
 run once.

---
 src/plugins/debugger/qml/qmlengine.cpp             | 11 +++++++----
 src/plugins/debugger/qml/qmlengine.h               |  2 ++
 src/plugins/qmljsinspector/qmljsdebuggerclient.cpp |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 9cd7fcdc7e7..79e864fe40e 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -126,9 +126,7 @@ void QmlEngine::shutdownInferior()
 void QmlEngine::shutdownEngine()
 {
     QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
-    //m_objectTreeWidget->saveSettings(m_settings);
-    //m_propertiesWidget->saveSettings(m_settings);
-    //m_settings.saveSettings(Core::ICore::instance()->settings());
+    notifyEngineShutdownOk();
 }
 
 const int serverPort = 3768;
@@ -138,7 +136,6 @@ void QmlEngine::setupEngine()
     notifyEngineSetupOk();
 }
 
-
 void QmlEngine::continueInferior()
 {
     QTC_ASSERT(state() == InferiorStopOk, qDebug() << state());
@@ -518,6 +515,12 @@ void QmlEngine::messageReceived(const QByteArray &message)
 
 }
 
+void QmlEngine::disconnected()
+{
+    notifyInferiorExited();
+}
+
+
 } // namespace Internal
 } // namespace Debugger
 
diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h
index d75763f956b..9520fe360dd 100644
--- a/src/plugins/debugger/qml/qmlengine.h
+++ b/src/plugins/debugger/qml/qmlengine.h
@@ -62,7 +62,9 @@ public:
     explicit QmlEngine(const DebuggerStartParameters &startParameters);
     ~QmlEngine();
 
+public slots:
     void messageReceived(const QByteArray &message);
+    void disconnected();
 
 private:
     // DebuggerEngine implementation
diff --git a/src/plugins/qmljsinspector/qmljsdebuggerclient.cpp b/src/plugins/qmljsinspector/qmljsdebuggerclient.cpp
index 7abf8d49793..36dac9a7a31 100644
--- a/src/plugins/qmljsinspector/qmljsdebuggerclient.cpp
+++ b/src/plugins/qmljsinspector/qmljsdebuggerclient.cpp
@@ -55,6 +55,7 @@ DebuggerClient::DebuggerClient(QDeclarativeDebugConnection* client)
     //engine->startSuccessful();  // FIXME: AAA: port to new debugger states
 
     connect(engine, SIGNAL(sendMessage(QByteArray)), this, SLOT(slotSendMessage(QByteArray)));
+    connect(connection, SIGNAL(disconnected()), engine, SLOT(disconnected()));
     setEnabled(true);
 }