Commit e85886d6 authored by Aurindam Jana's avatar Aurindam Jana
Browse files

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: default avatarChristian Kandeler <christian.kandeler@nokia.com>
parent 8bcd2ad1
...@@ -1814,7 +1814,7 @@ void DebuggerPluginPrivate::attachToQmlPort() ...@@ -1814,7 +1814,7 @@ void DebuggerPluginPrivate::attachToQmlPort()
sp.qmlServerPort = dlg.port(); sp.qmlServerPort = dlg.port();
sp.sysroot = dlg.sysroot(); sp.sysroot = dlg.sysroot();
sp.startMode = AttachToRemoteServer; sp.startMode = AttachToRemoteProcess;
sp.closeMode = KillAtClose; sp.closeMode = KillAtClose;
sp.languages = QmlLanguage; sp.languages = QmlLanguage;
......
...@@ -584,7 +584,8 @@ static QList<DebuggerEngineType> enginesForMode(DebuggerStartMode startMode, ...@@ -584,7 +584,8 @@ static QList<DebuggerEngineType> enginesForMode(DebuggerStartMode startMode,
if (languages == QmlLanguage) { if (languages == QmlLanguage) {
QTC_ASSERT(startMode == StartInternal QTC_ASSERT(startMode == StartInternal
|| startMode == AttachToRemoteServer, || startMode == AttachToRemoteServer
|| startMode == AttachToRemoteProcess,
qDebug() << "qml debugging not supported for mode" qDebug() << "qml debugging not supported for mode"
<< startMode); << startMode);
......
...@@ -594,6 +594,8 @@ void QmlEngine::runEngine() ...@@ -594,6 +594,8 @@ void QmlEngine::runEngine()
if (!isSlaveEngine()) { if (!isSlaveEngine()) {
if (startParameters().startMode == AttachToRemoteServer) if (startParameters().startMode == AttachToRemoteServer)
m_noDebugOutputTimer.start();
else if (startParameters().startMode == AttachToRemoteProcess)
beginConnection(); beginConnection();
else else
startApplicationLauncher(); startApplicationLauncher();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment