Merge remote-tracking branch 'origin/4.8'

 Conflicts:
	src/plugins/debugger/debuggermainwindow.cpp
	src/plugins/qbsprojectmanager/qbsbuildstep.cpp
	src/plugins/winrt/winrtdevicefactory.cpp
	tests/unit/unittest/gtest-creator-printing.cpp
	tests/unit/unittest/gtest-creator-printing.h
	tests/unit/unittest/unittest.pro

Change-Id: Ie9b80b87a8a4fa81baf72a2daa7919b21371c15e

5 files changed, 54 insertions, 2 deletions

diff --git a/src/libs/clangsupport/clangsupport.pro b/src/libs/clangsupport/clangsupport.pro
index fa614e74ff6..0475a13103d 100644
--- a/src/libs/clangsupport/clangsupport.pro
+++ b/src/libs/clangsupport/clangsupport.pro
@@ -1,2 +1,5 @@
 include(../../qtcreatorlibrary.pri)
 include(clangsupport-lib.pri)
+
+HEADERS += \
+    commandlinebuilderinterface.h
diff --git a/src/libs/clangsupport/codecompletion.h b/src/libs/clangsupport/codecompletion.h
index e3553f22a88..4a97fe08c15 100644
--- a/src/libs/clangsupport/codecompletion.h
+++ b/src/libs/clangsupport/codecompletion.h
@@ -42,16 +42,16 @@ using CodeCompletions = QVector<CodeCompletion>;
 class CodeCompletion
 {
 public:
-    enum Kind : quint32 {
+    enum Kind : uint8_t {
         Other = 0,
         FunctionCompletionKind,
         FunctionDefinitionCompletionKind,
         FunctionOverloadCompletionKind,
         TemplateFunctionCompletionKind,
+        ClassCompletionKind,
         ConstructorCompletionKind,
         DestructorCompletionKind,
         VariableCompletionKind,
-        ClassCompletionKind,
         TypeAliasCompletionKind,
         TemplateClassCompletionKind,
         EnumerationCompletionKind,
diff --git a/src/libs/clangsupport/commandlinebuilderinterface.h b/src/libs/clangsupport/commandlinebuilderinterface.h
new file mode 100644
index 00000000000..9823581456c
--- /dev/null
+++ b/src/libs/clangsupport/commandlinebuilderinterface.h
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#pragma once
+
+#include <utils/smallstringvector.h>
+
+namespace ClangBackEnd {
+
+class CommandLineBuilderInterface
+{
+public:
+    virtual Utils::PathStringVector create() = 0;
+
+protected:
+    ~CommandLineBuilderInterface() = default;
+};
+
+} // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/filecontainer.cpp b/src/libs/clangsupport/filecontainer.cpp
index 7f95e4b1d47..0f6f8288c90 100644
--- a/src/libs/clangsupport/filecontainer.cpp
+++ b/src/libs/clangsupport/filecontainer.cpp
@@ -36,6 +36,7 @@ QDebug operator<<(QDebug debug, const FileContainer &container)
     debug.nospace() << "FileContainer("
                     << container.filePath << ", "
                     << container.compilationArguments << ", "
+                    << container.headerPaths << ", "
                     << container.documentRevision << ", "
                     << container.textCodecName;
 
diff --git a/src/libs/clangsupport/filecontainer.h b/src/libs/clangsupport/filecontainer.h
index 16beff0bac0..4f9595f5baf 100644
--- a/src/libs/clangsupport/filecontainer.h
+++ b/src/libs/clangsupport/filecontainer.h
@@ -53,11 +53,13 @@ public:
 
     FileContainer(const Utf8String &filePath,
                   const Utf8StringVector &compilationArguments,
+                  const Utf8StringVector &headerPaths,
                   const Utf8String &unsavedFileContent = Utf8String(),
                   bool hasUnsavedFileContent = false,
                   quint32 documentRevision = 0)
         : filePath(filePath),
           compilationArguments(compilationArguments),
+          headerPaths(headerPaths),
           unsavedFileContent(unsavedFileContent),
           documentRevision(documentRevision),
           hasUnsavedFileContent(hasUnsavedFileContent)
@@ -66,9 +68,11 @@ public:
 
     FileContainer(const Utf8String &filePath,
                   const Utf8StringVector &compilationArguments,
+                  const Utf8StringVector &headerPaths,
                   quint32 documentRevision)
         : filePath(filePath),
           compilationArguments(compilationArguments),
+          headerPaths(headerPaths),
           documentRevision(documentRevision),
           hasUnsavedFileContent(false)
     {
@@ -78,6 +82,7 @@ public:
     {
         out << container.filePath;
         out << container.compilationArguments;
+        out << container.headerPaths;
         out << container.unsavedFileContent;
         out << container.textCodecName;
         out << container.documentRevision;
@@ -90,6 +95,7 @@ public:
     {
         in >> container.filePath;
         in >> container.compilationArguments;
+        in >> container.headerPaths;
         in >> container.unsavedFileContent;
         in >> container.textCodecName;
         in >> container.documentRevision;
@@ -106,6 +112,7 @@ public:
 public:
     Utf8String filePath;
     Utf8StringVector compilationArguments;
+    Utf8StringVector headerPaths;
     Utf8String unsavedFileContent;
     Utf8String textCodecName;
     quint32 documentRevision = 0;