From e85886d6387e0a4dcf4cc843e22b5cdd7879e9fa Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@nokia.com>
Date: Wed, 13 Jun 2012 11:55:16 +0200
Subject: [PATCH] QmlEngine: Attach to Remote Process

In the case of Attach to Remote Process, try connecting immediately.
While, in the case of Attach to Remote Server, wait for output message
or timeout.

Change-Id: I94570a2ab05bb069ea64819fcbb0055555fe0f33
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
 src/plugins/debugger/debuggerplugin.cpp | 2 +-
 src/plugins/debugger/debuggerrunner.cpp | 3 ++-
 src/plugins/debugger/qml/qmlengine.cpp  | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index d17b90f45fd..d6600b6bff7 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1814,7 +1814,7 @@ void DebuggerPluginPrivate::attachToQmlPort()
     sp.qmlServerPort = dlg.port();
     sp.sysroot = dlg.sysroot();
 
-    sp.startMode = AttachToRemoteServer;
+    sp.startMode = AttachToRemoteProcess;
     sp.closeMode = KillAtClose;
     sp.languages = QmlLanguage;
 
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index d545e91c554..b6ab4e14042 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -584,7 +584,8 @@ static QList<DebuggerEngineType> enginesForMode(DebuggerStartMode startMode,
 
     if (languages == QmlLanguage) {
         QTC_ASSERT(startMode == StartInternal
-                   || startMode == AttachToRemoteServer,
+                   || startMode == AttachToRemoteServer
+                   || startMode == AttachToRemoteProcess,
                    qDebug() << "qml debugging not supported for mode"
                             << startMode);
 
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 0c925a79c25..ccd3e7769ee 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -594,6 +594,8 @@ void QmlEngine::runEngine()
 
     if (!isSlaveEngine()) {
         if (startParameters().startMode == AttachToRemoteServer)
+            m_noDebugOutputTimer.start();
+        else if (startParameters().startMode == AttachToRemoteProcess)
             beginConnection();
         else
             startApplicationLauncher();