From 0a7e4c430a85733a16f200011196e9a650aed935 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Thu, 19 Aug 2010 14:58:29 +0200
Subject: [PATCH] gdb: Executable from start params takes precedence over
global setting.
---
src/plugins/debugger/gdb/gdbengine.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 708ebdb551b..26bd43ce6d8 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -3939,10 +3939,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())
- 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),
--
GitLab