Merge remote-tracking branch 'origin/4.8' into master

Change-Id: I6ecd3732a147960681c6135e8752cbd046bad65b
This commit is contained in:
Orgad Shaneh
2018-10-12 17:21:14 +03:00
185 changed files with 4302 additions and 1493 deletions

View File

@@ -104,7 +104,7 @@ CppTools::Usages RefactoringEngine::locationsAt(const CppTools::CursorInEditor &
const QByteArray filePath = data.filePath().toString().toUtf8();
const ClangBackEnd::FilePathId filePathId = m_filePathCache.filePathId(ClangBackEnd::FilePathView(filePath));
usages = m_symbolQuery.sourceUsagesAt(filePathId, lineColumn->line, lineColumn->column + 1);
usages = m_symbolQuery.sourceUsagesAt(filePathId, lineColumn->line, lineColumn->column);
}
return usages;