diff options
| author | hjk <qtc-committer@nokia.com> | 2009-12-09 18:46:03 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-01-06 15:57:11 +0100 |
| commit | e80e5e55807289318ae8edd857c91e752a046c85 (patch) | |
| tree | b95b41cddbac8f0a2856ddefefc1e8e0b3d10916 | |
| parent | db68ca5b8d7454eb0429dc169d3cfff66c7226d4 (diff) | |
| download | qt-creator-e80e5e55807289318ae8edd857c91e752a046c85.tar.gz | |
debugger: fix thinko in time out computation
(cherry picked from commit 33bdf429535dbd72d3a78aafecbad0c987c0b74c)
| -rw-r--r-- | src/plugins/debugger/gdb/gdbengine.cpp | 4 | ||||
| -rw-r--r-- | 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 070ab9a82c..dde22527f5 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 df703a5692..801b67bb2a 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><unlimited></string> - </property> <property name="minimum"> <number>20</number> </property> |