Merge remote-tracking branch 'origin/2.8' into HEAD

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5d2018d3437b99bcdffa92bf1a212f42923c4fad

src/libs/cplusplus/findcdbbreakpoint.cpp

@@ -212,6 +212,7 @@ bool FindCdbBreakpoint::visit(SwitchStatementAST *ast)
 bool FindCdbBreakpoint::visit(TryBlockStatementAST *ast)
 {
     accept(ast->statement);
+    accept(ast->catch_clause_list);
     return false;
 }