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>

3 files changed, 5 insertions, 2 deletions

diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index d17b90f45f..d6600b6bff 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 d545e91c55..b6ab4e1404 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 0c925a79c2..ccd3e7769e 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();