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

Maemo: Fix Qemu for recent MADDE.

Browse Source 
Reviewed-by: kh1
This commit is contained in:
ck
2010-02-03 15:20:12 +01:00
parent 77079d7cd4
commit 8a4f1ab555
6 changed files with 62 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
View File

@@ -244,7 +244,9 @@ const QString AbstractMaemoRunControl::executableOnHost() const
const QString AbstractMaemoRunControl::sshPort() const
{
return QString::number(devConfig.sshPort);
return devConfig.type == MaemoDeviceConfig::Physical
? QString::number(devConfig.sshPort)
: runConfig->simulatorSshPort();
}
const QString AbstractMaemoRunControl::executableFileName() const
@@ -476,8 +478,7 @@ MaemoDebugRunControl::MaemoDebugRunControl(RunConfiguration *runConfiguration)
startParams->startMode = Debugger::StartRemote;
startParams->executable = executableOnHost();
startParams->remoteChannel
= devConfig.host % QLatin1Char(':')
% QString::number(devConfig.gdbServerPort);
= devConfig.host % QLatin1Char(':') % gdbServerPort();
startParams->remoteArchitecture = QLatin1String("arm");
startParams->sysRoot = runConfig->sysRoot();
startParams->toolChainType = ToolChain::GCC_MAEMO;
@@ -518,7 +519,7 @@ void MaemoDebugRunControl::handleDeploymentFinished(bool success)
void MaemoDebugRunControl::startGdbServer()
{
const QString remoteCall(QString::fromLocal8Bit("%1 gdbserver :%2 %3 %4").
arg(targetCmdLinePrefix()).arg(devConfig.gdbServerPort)
arg(targetCmdLinePrefix()).arg(gdbServerPort())
.arg(executableOnTarget()).arg(runConfig->arguments().join(" ")));
inferiorPid = -1;
#ifdef USE_SSH_LIB
@@ -671,5 +672,12 @@ void MaemoDebugRunControl::debuggerOutput(const QString &output)
emit addToOutputWindowInline(this, output);
}
QString MaemoDebugRunControl::gdbServerPort() const
{
return devConfig.type == MaemoDeviceConfig::Physical
? QString::number(devConfig.gdbServerPort)
: runConfig->simulatorGdbServerPort();
}
} // namespace Internal
} // namespace Qt4ProjectManager