feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

debugger: move watchdog timeout initialization to a place where it actually can access the stored settings.

Browse Source 
(cherry picked from commit de23834fc9)

Conflicts:

	src/plugins/debugger/gdb/gdbengine.cpp
This commit is contained in:
con
2010-01-06 15:55:51 +01:00
parent e80e5e5580
commit ea2101950f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -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\""),