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

Debugger/gdb: Global setting should override start parameters.

Browse Source 
On-device gdb is an exception, because the local installation
does not know about it.
This commit is contained in:
Christian Kandeler
2010-09-17 13:44:35 +02:00
parent 96e06a9fbb
commit 9c56f4ffe6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4014,10 +4014,10 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &gdb, const QStr
gdbProc()->disconnect(); // From any previous runs
m_gdb = QString::fromLocal8Bit(qgetenv("QTC_DEBUGGER_PATH"));
if (m_gdb.isEmpty() && startParameters().startMode != StartRemoteGdb)
m_gdb = gdbBinaryForToolChain(startParameters().toolChainType);
if (m_gdb.isEmpty())
m_gdb = gdb;
if (m_gdb.isEmpty())
m_gdb = gdbBinaryForToolChain(startParameters().toolChainType);
if (m_gdb.isEmpty()) {
handleAdapterStartFailed(
msgNoBinaryForToolChain(startParameters().toolChainType),

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

@@ -115,7 +115,7 @@ MaemoDebugSupport::MaemoDebugSupport(MaemoRunConfiguration *runConfig,
m_runner(new MaemoSshRunner(this, m_runConfig, true)),
m_qmlOnlyDebugging(m_runConfig->useQmlDebugger() && !m_runConfig->useCppDebugger())
{
connect(m_runControl, SIGNAL(adapterRequestSetup()), this,
connect(m_runControl, SIGNAL(engineRequestSetup()), this,
SLOT(handleAdapterSetupRequested()));
connect(m_runControl, SIGNAL(finished()), this,
SLOT(handleDebuggingFinished()));