Merge remote-tracking branch 'origin/4.2'

Change-Id: I259a402bc896fc2e359cc96b7510453ac9a9a552
2016-11-28 15:27:51 +02:00
parent f69a466534 96256d1ecc
commit 7b3642cce4
128 changed files with 3030 additions and 1713 deletions
--- a/src/libs/clangbackendipc/filecontainer.h
+++ b/src/libs/clangbackendipc/filecontainer.h
@@ -51,6 +51,21 @@ public:
    {
    }

+    FileContainer(const Utf8String &filePath,
+                  const Utf8String &projectPartId,
+                  const Utf8StringVector &fileArguments,
+                  const Utf8String &unsavedFileContent = Utf8String(),
+                  bool hasUnsavedFileContent = false,
+                  quint32 documentRevision = 0)
+        : filePath_(filePath),
+          projectPartId_(projectPartId),
+          fileArguments_(fileArguments),
+          unsavedFileContent_(unsavedFileContent),
+          documentRevision_(documentRevision),
+          hasUnsavedFileContent_(hasUnsavedFileContent)
+    {
+    }
+
    FileContainer(const Utf8String &filePath,
                  const Utf8String &projectPartId,
                  const Utf8StringVector &fileArguments,