From 08c6899efa720f026e36d53276af693c97dbb27a Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 15 Jan 2010 11:35:33 +0100
Subject: [PATCH] debugger: scrap one of the 6.4 workarounds when using 6.8
---
src/plugins/debugger/gdb/gdbengine.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 645fb7d5cd3..0379837e408 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -2493,7 +2493,7 @@ void GdbEngine::reloadStack(bool forceGotoLocation)
// this sometimes happens, ask the second time immediately instead
// of waiting for the first request to fail.
// FIXME: Seems to work with 6.8.
- if (m_gdbAdapter->isTrkAdapter())
+ if (m_gdbAdapter->isTrkAdapter() && m_gdbVersion < 6.8)
postCommand(cmd, WatchUpdate);
postCommand(cmd, WatchUpdate, CB(handleStackListFrames),
QVariant::fromValue<StackCookie>(StackCookie(false, forceGotoLocation)));
--
GitLab