Commit c8aa3dc8 authored by Kai Koehne's avatar Kai Koehne
Browse files

QmlDebug: Fix debugging on local machine

Fix regression in that it always assumed that you want to debug
Symbian (over USB).
parent e6620167
......@@ -55,9 +55,9 @@ public:
CommunicationChannelUsb
};
enum DebugClient {
DebugClientTrk,
DebugClientCoda
enum SymbianDebugClient {
SymbianDebugClientTrk,
SymbianDebugClientCoda
};
DebuggerStartParameters()
......@@ -70,9 +70,9 @@ public:
connParams(Utils::SshConnectionParameters::NoProxy),
startMode(NoStartMode),
executableUid(0),
communicationChannel(CommunicationChannelUsb),
communicationChannel(CommunicationChannelTcpIp),
serverPort(0),
debugClient(DebugClientTrk)
debugClient(SymbianDebugClientTrk)
{}
QString executable;
......@@ -122,7 +122,7 @@ public:
CommunicationChannel communicationChannel;
QString serverAddress;
quint16 serverPort;
DebugClient debugClient;
SymbianDebugClient debugClient;
};
} // namespace Debugger
......
......@@ -1831,7 +1831,7 @@ AbstractGdbAdapter *GdbEngine::createAdapter()
const DebuggerStartParameters &sp = startParameters();
if (sp.toolChainAbi.os() == Abi::SymbianOS) {
// FIXME: 1 of 3 testing hacks.
if (sp.debugClient == DebuggerStartParameters::DebugClientCoda)
if (sp.debugClient == DebuggerStartParameters::SymbianDebugClientCoda)
return new CodaGdbAdapter(this);
else
return new TrkGdbAdapter(this);
......
......@@ -128,7 +128,7 @@ void QmlAdapter::connectToViewer()
const DebuggerStartParameters &parameters = d->m_engine.data()->startParameters();
if (parameters.communicationChannel == DebuggerStartParameters::CommunicationChannelUsb) {
if (parameters.debugClient == DebuggerStartParameters::DebugClientTrk) {
if (parameters.debugClient == DebuggerStartParameters::SymbianDebugClientTrk) {
d->m_connectionTimer.stop();
showConnectionErrorMessage(tr("QML debugging is not supported when using TRK!"));
emit connectionStartupFailed();
......
......@@ -480,8 +480,8 @@ static Debugger::DebuggerStartParameters s60DebuggerStartParams(const S60DeviceR
Debugger::DebuggerStartParameters::CommunicationChannelUsb;
sp.debugClient = activeDeployConf->communicationChannel() == S60DeployConfiguration::CommunicationTrkSerialConnection?
Debugger::DebuggerStartParameters::DebugClientTrk:
Debugger::DebuggerStartParameters::DebugClientCoda;
Debugger::DebuggerStartParameters::SymbianDebugClientTrk:
Debugger::DebuggerStartParameters::SymbianDebugClientCoda;
QTC_ASSERT(sp.executableUid, return sp);
......
Markdown is supported
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