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.h

@@ -61,6 +61,8 @@ public:
     QString combinedContents() const;
     QString inputContents() const;
 
+    void clearUndoRedoStacks();
+
     static QString logTimeStamp();
 
     static bool writeLogContents(const QPlainTextEdit *editor, QWidget *parent = 0);