From 9c56f4ffe6933c269494e09fdcb178a465bd6bdc Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Fri, 17 Sep 2010 13:44:35 +0200
Subject: [PATCH] Debugger/gdb: Global setting should override start
parameters.
On-device gdb is an exception, because the local installation
does not know about it.
---
src/plugins/debugger/gdb/gdbengine.cpp | 4 ++--
src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 179802a3cab..22a7a51e800 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -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),
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
index c04994e7cf1..741f844236f 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
@@ -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()));
--
GitLab