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

Change-Id: I9b53d00dbc79d52e52f6e18761e6a6c6faec6c84

1 files changed, 8 insertions, 2 deletions

diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp
index dd9530744b..d50ca6e96c 100644
--- a/src/plugins/debugger/logwindow.cpp
+++ b/src/plugins/debugger/logwindow.cpp
@@ -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()