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

Merge remote-tracking branch 'origin/4.10' into 4.11

Browse Source 
Change-Id: I9b53d00dbc79d52e52f6e18761e6a6c6faec6c84
This commit is contained in:
Eike Ziller
2019-10-08 15:21:12 +02:00
parent a3f5fa09f5 f0bd0a8baf
commit a19d905ea5
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/debugger/logwindow.cpp
View File

@@ -552,8 +552,14 @@ void LogWindow::showOutput(int channel, const QString &output)
out.append(nchar);
m_queuedOutput.append(out);
m_outputTimer.setSingleShot(true);
m_outputTimer.start(80);
// flush the output if it exceeds 16k to prevent out of memory exceptions on regular output
if (m_queuedOutput.size() > 16 * 1024) {
m_outputTimer.stop();
doOutput();
} else {
m_outputTimer.setSingleShot(true);
m_outputTimer.start(80);
}
}
void LogWindow::doOutput()

4
src/plugins/debugger/watchhandler.cpp
View File

@@ -899,9 +899,9 @@ static QColor valueColor(const WatchItem *item, int column)
color = Theme::Debugger_WatchItem_ValueInvalid;
else if (!model->m_contentsValid && !item->isInspect())
color = Theme::Debugger_WatchItem_ValueInvalid;
else if (column == 1 && item->value.isEmpty()) // This might still show 0x...
else if (item->value.isEmpty()) // This might still show 0x...
color = Theme::Debugger_WatchItem_ValueInvalid;
else if (column == 1 && item->value != model->m_valueCache.value(item->iname))
else if (item->value != model->m_valueCache.value(item->iname))
color = Theme::Debugger_WatchItem_ValueChanged;
}
}