Merge remote-tracking branch 'origin/2.8'

Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48

src/plugins/debugger/logwindow.cpp

@@ -200,6 +200,13 @@ public:
         appendPlainText(text);
     }
 
+    void clearUndoRedoStacks()
+    {
+        if (!isUndoRedoEnabled())
+            return;
+        setUndoRedoEnabled(false);
+        setUndoRedoEnabled(true);
+    }
 
 private slots:
     void saveContents();
@@ -551,6 +558,12 @@ QString LogWindow::inputContents() const
     return m_inputText->toPlainText();
 }
 
+void LogWindow::clearUndoRedoStacks()
+{
+    m_inputText->clearUndoRedoStacks();
+    m_combinedText->clearUndoRedoStacks();
+}
+
 QString LogWindow::logTimeStamp()
 {
     // Cache the last log time entry by ms. If time progresses,