Synchronize the client with the debug service

The v8 engine is blocked till the client is connected to the service to ensure proper hitting of breakpoints.

Task-number: QTCREATORBUG-5412

Change-Id: Iec772cb547a31fef4cccbd4bb1116699c52d20e5
Reviewed-on: http://codereview.qt.nokia.com/3308
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

src/plugins/debugger/qml/qmladapter.cpp

@@ -170,6 +170,7 @@ void QmlAdapter::clientStatusChanged(QDeclarativeDebugClient::Status status)
 
     if (status == QDeclarativeDebugClient::Enabled) {
         d->m_qmlClient = d->debugClients.value(serviceName);
+        d->m_qmlClient->connect();
         d->m_qmlClient->flushSendBuffer();
     }
 }

src/plugins/debugger/qml/qmldebuggerclient.h

@@ -52,6 +52,9 @@ public:
     QmlDebuggerClient(QmlJsDebugClient::QDeclarativeDebugConnection* client, QLatin1String clientName);
     virtual ~QmlDebuggerClient();
 
+    virtual void connect() = 0;
+    virtual void disconnect() = 0;
+
     virtual void executeStep() = 0;
     virtual void executeStepOut() = 0;
     virtual void executeNext() = 0;
@@ -59,7 +62,6 @@ public:
 
     virtual void continueInferior() = 0;
     virtual void interruptInferior() = 0;
-    virtual void shutdownInferior() = 0;
 
     virtual void activateFrame(int index) = 0;
 

src/plugins/debugger/qml/qmlengine.cpp

@@ -375,7 +375,7 @@ void QmlEngine::handleRemoteSetupFailed(const QString &message)
 
 void QmlEngine::shutdownInferior()
 {
-    d->m_adapter.activeDebuggerClient()->shutdownInferior();
+    d->m_adapter.activeDebuggerClient()->disconnect();
 
     if (isSlaveEngine()) {
         resetLocation();

src/plugins/debugger/qml/qmlv8debuggerclient.cpp

@@ -192,7 +192,19 @@ void QmlV8DebuggerClient::interruptInferior()
 
 }
 
-void QmlV8DebuggerClient::shutdownInferior()
+void QmlV8DebuggerClient::connect()
+{
+    QByteArray request;
+
+    JsonInputStream(request) << '{' << INITIALPARAMS ;
+    JsonInputStream(request) << ',' << "command" << ':' << "connect";
+
+    JsonInputStream(request) << '}';
+
+    sendMessage(packMessage(request));
+}
+
+void QmlV8DebuggerClient::disconnect()
 {
     QByteArray request;
 

src/plugins/debugger/qml/qmlv8debuggerclient.h

@@ -52,6 +52,9 @@ public:
     explicit QmlV8DebuggerClient(QmlJsDebugClient::QDeclarativeDebugConnection *client);
     ~QmlV8DebuggerClient();
 
+    void connect();
+    void disconnect();
+
     void executeStep();
     void executeStepOut();
     void executeNext();
@@ -59,7 +62,6 @@ public:
 
     void continueInferior();
     void interruptInferior();
-    void shutdownInferior();
 
     void activateFrame(int index);
 

src/plugins/debugger/qml/qscriptdebuggerclient.cpp

@@ -192,9 +192,12 @@ void QScriptDebuggerClient::interruptInferior()
     sendMessage(reply);
 }
 
-void QScriptDebuggerClient::shutdownInferior()
+void QScriptDebuggerClient::connect()
 {
+}
 
+void QScriptDebuggerClient::disconnect()
+{
 }
 
 void QScriptDebuggerClient::activateFrame(int index)

src/plugins/debugger/qml/qscriptdebuggerclient.h

@@ -51,6 +51,9 @@ public:
     QScriptDebuggerClient(QmlJsDebugClient::QDeclarativeDebugConnection *client);
     ~QScriptDebuggerClient();
 
+    void connect();
+    void disconnect();
+
     void executeStep();
     void executeStepOut();
     void executeNext();
@@ -58,7 +61,6 @@ public:
 
     void continueInferior();
     void interruptInferior();
-    void shutdownInferior();
 
     void activateFrame(int index);