Merge remote-tracking branch 'origin/4.0'

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa

src/plugins/clangcodemodel/clangcompletioncontextanalyzer.h

@@ -63,7 +63,12 @@ public:
 private:
     ClangCompletionContextAnalyzer();
 
-    struct FunctionInfo { int functionNamePosition; QString functionName; };
+    struct FunctionInfo {
+        bool isValid() const { return functionNamePosition != -1 && !functionName.isEmpty(); }
+
+        int functionNamePosition = -1;
+        QString functionName;
+    };
     FunctionInfo analyzeFunctionCall(int endOfExpression) const;
 
     void setActionAndClangPosition(CompletionAction action, int position);