From e80e5e55807289318ae8edd857c91e752a046c85 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 9 Dec 2009 18:46:03 +0100
Subject: [PATCH] debugger: fix thinko in time out computation (cherry picked
 from commit 33bdf429535dbd72d3a78aafecbad0c987c0b74c)

---
 src/plugins/debugger/gdb/gdbengine.cpp     | 4 ++--
 src/plugins/debugger/gdb/gdboptionspage.ui | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 070ab9a82ce..dde22527f5a 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -195,8 +195,8 @@ GdbEngine::GdbEngine(DebuggerManager *manager) :
 
     m_commandTimer = new QTimer(this);
     m_commandTimer->setSingleShot(true);
-    m_commandTimer->setInterval(
-        1000 * qMin(20, theDebuggerAction(GdbWatchdogTimeout)->value().toInt()));
+    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()
diff --git a/src/plugins/debugger/gdb/gdboptionspage.ui b/src/plugins/debugger/gdb/gdboptionspage.ui
index df703a5692c..801b67bb2a2 100644
--- a/src/plugins/debugger/gdb/gdboptionspage.ui
+++ b/src/plugins/debugger/gdb/gdboptionspage.ui
@@ -94,9 +94,6 @@ on slow machines. In this case the value should be increased.</string>
         <property name="layoutDirection">
          <enum>Qt::LeftToRight</enum>
         </property>
-        <property name="specialValueText">
-         <string>&lt;unlimited&gt;</string>
-        </property>
         <property name="minimum">
          <number>20</number>
         </property>