summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordt <qtc-committer@nokia.com>2009-04-15 15:42:39 +0200
committerdt <qtc-committer@nokia.com>2009-04-15 15:42:39 +0200
commitf15660cb5c14c90424ff15c886e213ec87f6f455 (patch)
treec61b421aa1caa163d99dcf148d7533691f7d3eee
parent1e0561e8e5781c61fa884e61132ac573db842170 (diff)
parente61fa399ed1a2b8c418ad7c80683d20d67621abc (diff)
downloadqt-creator-f15660cb5c14c90424ff15c886e213ec87f6f455.tar.gz
Merge branch '1.1' of git@scm.dev.nokia.troll.no:creator/mainline into 1.1
-rw-r--r--src/plugins/debugger/gdbengine.cpp16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/plugins/debugger/gdbengine.cpp b/src/plugins/debugger/gdbengine.cpp
index 20c5600258..3171895810 100644
--- a/src/plugins/debugger/gdbengine.cpp
+++ b/src/plugins/debugger/gdbengine.cpp
@@ -163,6 +163,20 @@ static int &currentToken()
return token;
}
+static bool isSkippable(int type)
+{
+ return type == RegisterListValues
+ && type == StackListThreads
+ && type == StackListFrames
+ && type == StackListLocals
+ && type == StackListArguments
+ && type == WatchVarAssign
+ && type == WatchVarListChildren
+ && type == WatchVarCreate
+ && type == WatchEvaluateExpression
+ && type == WatchToolTip;
+}
+
///////////////////////////////////////////////////////////////////////
//
// GdbEngine
@@ -680,7 +694,7 @@ void GdbEngine::handleResultRecord(const GdbResultRecord &record)
GdbCookie cmd = m_cookieForToken.take(token);
- if (record.token < m_oldestAcceptableToken) {
+ if (record.token < m_oldestAcceptableToken && isSkippable(cmd.type)) {
//qDebug() << "### SKIPPING OLD RESULT " << record.toString();
//QMessageBox::information(m_mainWindow, tr("Skipped"), "xxx");
return;