forked from qt-creator/qt-creator
Merge branch '1.1' of git@scm.dev.nokia.troll.no:creator/mainline into 1.1
This commit is contained in:
@@ -163,6 +163,20 @@ static int ¤tToken()
|
|||||||
return token;
|
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
|
// GdbEngine
|
||||||
@@ -680,7 +694,7 @@ void GdbEngine::handleResultRecord(const GdbResultRecord &record)
|
|||||||
|
|
||||||
GdbCookie cmd = m_cookieForToken.take(token);
|
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();
|
//qDebug() << "### SKIPPING OLD RESULT " << record.toString();
|
||||||
//QMessageBox::information(m_mainWindow, tr("Skipped"), "xxx");
|
//QMessageBox::information(m_mainWindow, tr("Skipped"), "xxx");
|
||||||
return;
|
return;
|
||||||
|
Reference in New Issue
Block a user