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

Merge remote branch 'origin/2.2'

Browse Source 
Conflicts:
	qtcreator.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
This commit is contained in:
con
2011-04-18 13:57:07 +02:00
parent a10e3a04d0 d7e1d74aac
commit 5b02bf94a8
57 changed files with 9576 additions and 1683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
View File

@@ -295,17 +295,34 @@ void MaemoDebugSupport::startDebugging()
args += QString(QLatin1String(" -qmljsdebugger=port:%1,block"))
.arg(m_qmlPort);
}
const QString remoteCommandLine
= m_debuggingType == MaemoRunConfiguration::DebugQmlOnly
? QString::fromLocal8Bit("%1 %2 %3 %4").arg(cmdPrefix).arg(env)
.arg(remoteExe).arg(args)
: QString::fromLocal8Bit("%1 %2 gdbserver :%3 %4 %5")
.arg(cmdPrefix).arg(env).arg(m_gdbServerPort)
.arg(remoteExe).arg(args);
QString remoteCommandLine;
if (m_debuggingType == MaemoRunConfiguration::DebugQmlOnly) {
remoteCommandLine = QString::fromLocal8Bit("%1 %2 %3 %4")
.arg(cmdPrefix).arg(env).arg(remoteExe).arg(args);
} else {
remoteCommandLine = QString::fromLocal8Bit("%1 %2 gdbserver :%3 %4 %5")
.arg(cmdPrefix).arg(env).arg(m_gdbServerPort)
.arg(remoteExe).arg(args);
connect(m_runner, SIGNAL(remoteProcessFinished(qint64)),
SLOT(handleGdbServerFinished(qint64)));
}
m_runner->startExecution(remoteCommandLine.toUtf8());
}
}
void MaemoDebugSupport::handleGdbServerFinished(qint64 exitCode)
{
if (!m_engine || m_state == Inactive || exitCode == 0)
return;
if (m_state == Debugging)
m_engine->notifyInferiorIll();
else
m_engine->handleRemoteSetupFailed(tr("The gdbserver process closed unexpectedly."));
}
void MaemoDebugSupport::handleDebuggingFinished()
{
setState(Inactive);