Debugger/gdb: Global setting should override start parameters.

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

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),