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

QmlDebug: Fix debugging on local machine

Browse Source 
Fix regression in that it always assumed that you want to debug
Symbian (over USB).
This commit is contained in:
Kai Koehne
2011-04-13 15:47:13 +02:00
parent e6620167fc
commit c8aa3dc8d2
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/debuggerstartparameters.h
View File

@@ -55,9 +55,9 @@ public:
CommunicationChannelUsb CommunicationChannelUsb
}; };
enum DebugClient { enum SymbianDebugClient {
DebugClientTrk, SymbianDebugClientTrk,
DebugClientCoda SymbianDebugClientCoda
}; };
DebuggerStartParameters() DebuggerStartParameters()
@@ -70,9 +70,9 @@ public:
connParams(Utils::SshConnectionParameters::NoProxy), connParams(Utils::SshConnectionParameters::NoProxy),
startMode(NoStartMode), startMode(NoStartMode),
executableUid(0), executableUid(0),
communicationChannel(CommunicationChannelUsb), communicationChannel(CommunicationChannelTcpIp),
serverPort(0), serverPort(0),
debugClient(DebugClientTrk) debugClient(SymbianDebugClientTrk)
{} {}
QString executable; QString executable;
@@ -122,7 +122,7 @@ public:
CommunicationChannel communicationChannel; CommunicationChannel communicationChannel;
QString serverAddress; QString serverAddress;
quint16 serverPort; quint16 serverPort;
DebugClient debugClient; SymbianDebugClient debugClient;
}; };
} // namespace Debugger } // namespace Debugger

2
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -1831,7 +1831,7 @@ AbstractGdbAdapter *GdbEngine::createAdapter()
const DebuggerStartParameters &sp = startParameters(); const DebuggerStartParameters &sp = startParameters();
if (sp.toolChainAbi.os() == Abi::SymbianOS) { if (sp.toolChainAbi.os() == Abi::SymbianOS) {
// FIXME: 1 of 3 testing hacks. // FIXME: 1 of 3 testing hacks.
if (sp.debugClient == DebuggerStartParameters::DebugClientCoda) if (sp.debugClient == DebuggerStartParameters::SymbianDebugClientCoda)
return new CodaGdbAdapter(this); return new CodaGdbAdapter(this);
else else
return new TrkGdbAdapter(this); return new TrkGdbAdapter(this);

2
src/plugins/debugger/qml/qmladapter.cpp
View File

@@ -128,7 +128,7 @@ void QmlAdapter::connectToViewer()
const DebuggerStartParameters &parameters = d->m_engine.data()->startParameters(); const DebuggerStartParameters &parameters = d->m_engine.data()->startParameters();
if (parameters.communicationChannel == DebuggerStartParameters::CommunicationChannelUsb) { if (parameters.communicationChannel == DebuggerStartParameters::CommunicationChannelUsb) {
if (parameters.debugClient == DebuggerStartParameters::DebugClientTrk) { if (parameters.debugClient == DebuggerStartParameters::SymbianDebugClientTrk) {
d->m_connectionTimer.stop(); d->m_connectionTimer.stop();
showConnectionErrorMessage(tr("QML debugging is not supported when using TRK!")); showConnectionErrorMessage(tr("QML debugging is not supported when using TRK!"));
emit connectionStartupFailed(); emit connectionStartupFailed();

4
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -480,8 +480,8 @@ static Debugger::DebuggerStartParameters s60DebuggerStartParams(const S60DeviceR
Debugger::DebuggerStartParameters::CommunicationChannelUsb; Debugger::DebuggerStartParameters::CommunicationChannelUsb;
sp.debugClient = activeDeployConf->communicationChannel() == S60DeployConfiguration::CommunicationTrkSerialConnection? sp.debugClient = activeDeployConf->communicationChannel() == S60DeployConfiguration::CommunicationTrkSerialConnection?
Debugger::DebuggerStartParameters::DebugClientTrk: Debugger::DebuggerStartParameters::SymbianDebugClientTrk:
Debugger::DebuggerStartParameters::DebugClientCoda; Debugger::DebuggerStartParameters::SymbianDebugClientCoda;
QTC_ASSERT(sp.executableUid, return sp); QTC_ASSERT(sp.executableUid, return sp);