From ea2101950ff00d69124dc9f0b9898aa5724ba371 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Wed, 6 Jan 2010 15:55:51 +0100
Subject: [PATCH] debugger: move watchdog timeout initialization to a place
where it actually can access the stored settings.
(cherry picked from commit de23834fc9ded8ad0f1360151b9160fd6b5293b5)
Conflicts:
src/plugins/debugger/gdb/gdbengine.cpp
---
src/plugins/debugger/gdb/gdbengine.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index dde22527f5a..ed9860bbf82 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -195,8 +195,6 @@ GdbEngine::GdbEngine(DebuggerManager *manager) :
m_commandTimer = new QTimer(this);
m_commandTimer->setSingleShot(true);
- QVariant timeOut = theDebuggerAction(GdbWatchdogTimeout)->value();
- m_commandTimer->setInterval(1000 * qMax(20, timeOut.toInt()));
connect(m_commandTimer, SIGNAL(timeout()), SLOT(commandTimeout()));
// Needs no resetting in initializeVariables()
@@ -4376,7 +4374,8 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &gdb, const QStr
SLOT(readGdbStandardError()));
debugMessage(_("GDB STARTED, INITIALIZING IT"));
- m_commandTimer->setInterval(commandTimeoutTime());
+ int timeOut = theDebuggerAction(GdbWatchdogTimeout)->value().toInt();
+ m_commandTimer->setInterval(1000 * qMax(20, timeOut));
postCommand(_("show version"), CB(handleShowVersion));
postCommand(_("-interpreter-exec console \"help bb\""),
--
GitLab