Merge remote-tracking branch 'origin/4.4'

Change-Id: I5b12586086297b57e250bbbd9c94818623ad33f9

1 files changed, 3 insertions, 2 deletions

diff --git a/src/tools/clangrefactoringbackend/source/sourcerangeextractor.cpp b/src/tools/clangrefactoringbackend/source/sourcerangeextractor.cpp
index 6d9d498227..399a7353f3 100644
--- a/src/tools/clangrefactoringbackend/source/sourcerangeextractor.cpp
+++ b/src/tools/clangrefactoringbackend/source/sourcerangeextractor.cpp
@@ -69,6 +69,7 @@ std::reverse_iterator<Iterator> make_reverse_iterator(Iterator iterator)
 {
     return std::reverse_iterator<Iterator>(iterator);
 }
+
 }
 
 const char *SourceRangeExtractor::findStartOfLineInBuffer(llvm::StringRef buffer, uint startOffset)
@@ -152,7 +153,7 @@ FilePathIndex SourceRangeExtractor::findFileId(clang::FileID fileId, const clang
        return found->second;
     }
 
-    auto filePath = absolutePath(fileEntry->tryGetRealPathName());
+    auto filePath = absolutePath(fileEntry->getName());
     return filePathCache.stringId(fromNativePath(filePath));
 }
 
@@ -175,7 +176,7 @@ void SourceRangeExtractor::addSourceRange(const clang::SourceRange &sourceRange)
                                                          endOffset);
 
         insertSourceRange(findFileId(fileId, fileEntry),
-                          fromNativePath(fileEntry->tryGetRealPathName()),
+                          fromNativePath(absolutePath(fileEntry->getName())),
                           startSourceLocation,
                           startOffset,
                           endSourceLocation,