Merge remote-tracking branch 'origin/3.1'

Conflicts:
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: I1bad0c1477d7fd6996c0f8ca82e76ba521bc0dcc

src/libs/cplusplus/PPToken.cpp

@@ -32,6 +32,7 @@
 #include <cstring>
 
 using namespace CPlusPlus;
+using namespace CPlusPlus::Internal;
 
 bool ByteArrayRef::startsWith(const char *s) const
 {
@@ -52,7 +53,7 @@ int ByteArrayRef::count(char ch) const
     return num;
 }
 
-void Internal::PPToken::squeezeSource()
+void PPToken::squeezeSource()
 {
     if (hasSource()) {
         m_src = m_src.mid(byteOffset, f.bytes);