Merge remote-tracking branch 'origin/2.7'

Conflicts:
	src/plugins/android/androidrunner.cpp
	src/plugins/clearcase/clearcasesync.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	tests/auto/ioutils/ioutils.pro

Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370

src/libs/cplusplus/pp-engine.cpp

@@ -702,6 +702,7 @@ QByteArray Preprocessor::run(const QString &fileName,
     m_scratchBuffer.clear();
 
     QByteArray preprocessed, includeGuardMacroName;
+    preprocessed.reserve(source.size() * 2); // multiply by 2 because we insert #gen lines.
     preprocess(fileName, source, &preprocessed, &includeGuardMacroName, noLines,
                markGeneratedTokens, false);
     if (!includeGuardMacroName.isEmpty())