From adb6e518ef8d05379440c0ebac7c3c8c698d1f08 Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@digia.com>
Date: Fri, 19 Apr 2013 17:04:22 +0200
Subject: [PATCH] AndroidDebugging: Enable Cpp/QML mixed debugging

Change-Id: Ie748b52a93916b332f1e4fa7c6ff04dd6cc30bfa
Reviewed-by: hjk <hjk121@nokiamail.com>
---
 src/plugins/debugger/qml/qmlcppengine.cpp | 12 ++++++++++++
 src/plugins/debugger/qml/qmlcppengine.h   |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 22768218f54..90237fab68a 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -440,6 +440,18 @@ void QmlCppEngine::notifyInferiorShutdownOk()
     DebuggerEngine::notifyInferiorShutdownOk();
 }
 
+void QmlCppEngine::notifyInferiorSetupOk()
+{
+    EDEBUG("\nMASTER INFERIOR SETUP OK");
+    emit aboutToNotifyInferiorSetupOk();
+    DebuggerEngine::notifyInferiorSetupOk();
+}
+
+void QmlCppEngine::notifyEngineRemoteServerRunning(const QByteArray &serverChannel, int pid)
+{
+    d->m_cppEngine->notifyEngineRemoteServerRunning(serverChannel, pid);
+}
+
 void QmlCppEngine::setupInferior()
 {
     EDEBUG("\nMASTER SETUP INFERIOR");
diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h
index fff3041be03..c0a0226782d 100644
--- a/src/plugins/debugger/qml/qmlcppengine.h
+++ b/src/plugins/debugger/qml/qmlcppengine.h
@@ -125,6 +125,12 @@ protected:
     void notifyEngineRunAndInferiorRunOk();
     void notifyInferiorShutdownOk();
 
+    void notifyInferiorSetupOk();
+    void notifyEngineRemoteServerRunning(const QByteArray &, int pid);
+
+signals:
+    void aboutToNotifyInferiorSetupOk();
+
 private:
     void engineStateChanged(DebuggerState newState);
     void setState(DebuggerState newState, bool forced = false);