Merge remote-tracking branch 'origin/4.8'

Conflicts:
	src/plugins/winrt/winrtdevicefactory.cpp

Change-Id: I33b8697e2ebf2bea051d7f1144449e0743ee16a5

src/plugins/clangcodemodel/clangcompletionassistprocessor.h

@@ -85,6 +85,8 @@ private:
                                const QByteArray &customFileContent,
                                int functionNameStartPosition = -1);
 
+    CodeCompletions applyCompletionFixIt(const CodeCompletions &completions);
+
 private:
     struct Position { int line; int column; };
     Position extractLineColumn(int position);