Merge remote-tracking branch 'origin/4.9'

 Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/debugger/debuggerkitinformation.cpp
	src/plugins/languageclient/languageclientmanager.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/kit.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I66fb941202991f35f7d7761430b21e42dfc678a8

1 files changed, 7 insertions, 6 deletions

diff --git a/src/tools/clangpchmanagerbackend/source/builddependency.h b/src/tools/clangpchmanagerbackend/source/builddependency.h
index 1b649e3118d..6725254e308 100644
--- a/src/tools/clangpchmanagerbackend/source/builddependency.h
+++ b/src/tools/clangpchmanagerbackend/source/builddependency.h
@@ -37,7 +37,7 @@ class BuildDependency
 public:
     void clear()
     {
-        includes.clear();
+        sources.clear();
         usedMacros.clear();
         sourceFiles.clear();
         fileStatuses.clear();
@@ -46,14 +46,15 @@ public:
 
     friend bool operator==(const BuildDependency &first, const BuildDependency &second)
     {
-        return first.includes == second.includes && first.usedMacros == second.usedMacros
-               && first.sourceFiles == second.sourceFiles
-               && first.sourceDependencies == second.sourceDependencies
-               && first.fileStatuses == second.fileStatuses;
+        return first.sources == second.sources &&
+            first.usedMacros == second.usedMacros &&
+            first.sourceFiles == second.sourceFiles &&
+            first.sourceDependencies == second.sourceDependencies &&
+            first.fileStatuses == second.fileStatuses;
     }
 
 public:
-    SourceEntries includes;
+    SourceEntries sources;
     UsedMacros usedMacros;
     FilePathIds sourceFiles;
     SourceDependencies sourceDependencies;