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

debugger: merge notifyEngineRemoteSetup* and handleRemoteSetup*

Browse Source 
Change-Id: I89abcb0dcceef6767cb3e78f4e85c1cd718e78c1
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-06-13 11:29:26 +02:00
committed by hjk
parent d601e3799f
commit ceb575741c
17 changed files with 56 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androiddebugsupport.cpp
View File

@@ -84,7 +84,7 @@ RunControl *AndroidDebugSupport::createDebugRunControl(AndroidRunConfiguration *
params.solibSearchPath.append(qtSoPaths(runConfig->activeQt4BuildConfiguration()->qtVersion()));
params.useServerStartScript = true;
params.requestRemoteSetup = true;
params.remoteSetupNeeded = true;
params.remoteArchitecture = QLatin1String("arm");
DebuggerRunControl * const debuggerRunControl
@@ -124,14 +124,14 @@ void AndroidDebugSupport::handleRemoteProcessStarted(int gdbServerPort, int qmlP
{
disconnect(m_runner, SIGNAL(remoteProcessStarted(int,int)),
this, SLOT(handleRemoteProcessStarted(int,int)));
m_runControl->engine()->handleRemoteSetupDone(gdbServerPort, qmlPort);
m_runControl->engine()->notifyEngineRemoteSetupDone(gdbServerPort, qmlPort);
}
void AndroidDebugSupport::handleRemoteProcessFinished(const QString &errorMsg)
{
disconnect(m_runner, SIGNAL(remoteProcessFinished(const QString &)),
this,SLOT(handleRemoteProcessFinished(const QString &)));
m_runControl->engine()->handleRemoteSetupFailed(errorMsg);
m_runControl->engine()->notifyEngineRemoteSetupFailed(errorMsg);
}
void AndroidDebugSupport::handleRemoteOutput(const QByteArray &output)