feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Fix Android startup

Browse Source 
Change-Id: I495412434ccffdb33528bbbe030c7a4bfa7e387c
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-09-18 20:01:19 +02:00
parent 2fffafe2db
commit 3bafbe710f
4 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/debugger/debuggerengine.cpp
View File

@@ -846,6 +846,21 @@ void DebuggerEngine::notifyEngineRemoteSetupFinished(const RemoteSetupResult &re
if (d->remoteSetupState() != RemoteSetupCancelled)
d->setRemoteSetupState(RemoteSetupSucceeded);
if (result.gdbServerPort != InvalidPid) {
QString &rc = d->m_startParameters.remoteChannel;
const int sepIndex = rc.lastIndexOf(QLatin1Char(':'));
if (sepIndex != -1) {
rc.replace(sepIndex + 1, rc.count() - sepIndex - 1,
QString::number(result.gdbServerPort));
}
}
if (result.qmlServerPort != InvalidPort) {
d->m_startParameters.qmlServerPort = result.qmlServerPort;
d->m_startParameters.processArgs.replace(_("%qml_port%"), QString::number(result.qmlServerPort));
}
} else {
showMessage(_("NOTE: REMOTE SETUP FAILED: ") + result.reason);
}