This reverts commits: c721304a 885d908e a0909989 fb4ad59d 0a9a67cf 0d1624d4 d018cfd5 0504fdd0 a2fd10fe Conflicts: src/plugins/cpptools/cppcodecompletion.cpp Reviewed-by: Roberto Raggi