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

@@ -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;
 

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);
 

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();