Merge remote-tracking branch 'origin/2.5'

Conflicts:
	src/libs/cplusplus/cplusplus-lib.pri

Change-Id: I430ec8c6dda4afad3aedb1bc47d3af64537cfe66

src/libs/cplusplus/CppDocument.h

@@ -40,6 +40,11 @@
 #include <QFileInfo>
 #include <QAtomicInt>
 
+// in debug mode: make dumpers widely available without an extra include
+#ifdef QT_DEBUG
+#include "Dumpers.h"
+#endif
+
 namespace CPlusPlus {
 
 class Macro;