Merge remote-tracking branch 'origin/2.8'

Conflicts:
	src/plugins/coreplugin/documentmanager.cpp

Change-Id: I6dc025bc0f31eb694c8d9e2dd4ea5cc888ee8a94

1 files changed, 3 insertions, 3 deletions

diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp
index 84092fc93d..7df0d2d2e5 100644
--- a/src/libs/cplusplus/CppDocument.cpp
+++ b/src/libs/cplusplus/CppDocument.cpp
@@ -341,15 +341,15 @@ QStringList Document::includedFiles() const
 {
     QStringList files;
     foreach (const Include &i, _includes)
-        files.append(i.fileName());
+        files.append(i.resolvedFileName());
     files.removeDuplicates();
     return files;
 }
 
 // This assumes to be called with a QDir::cleanPath cleaned fileName.
-void Document::addIncludeFile(const QString &fileName, unsigned line)
+void Document::addIncludeFile(const Document::Include &include)
 {
-    _includes.append(Include(fileName, line));
+    _includes.append(include);
 }
 
 void Document::appendMacro(const Macro &macro)