feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/12.0'

Browse Source 
Conflicts:
	src/plugins/cppeditor/cppfilesettingspage.cpp
	src/plugins/haskell/haskellplugin.h

Change-Id: I880693c2e4986853b7aa600a5b7d6c09ad14634e
This commit is contained in:
Eike Ziller
2024-01-30 09:00:47 +01:00
parent 7e8aac5f3c 79e323afbf
commit 30d048a256
14 changed files with 68 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
View File

@@ -182,8 +182,7 @@ static QVector<FolderNode::LocationInfo> extractBacktraceInformation(
const size_t fileIndex = static_cast<size_t>(btNode.file);
QTC_ASSERT(fileIndex < backtraces.files.size(), break);
const FilePath path = sourceDir.pathAppended(backtraces.files[fileIndex]).absoluteFilePath();
const FilePath path = sourceDir.resolvePath(backtraces.files[fileIndex]);
if (btNode.command < 0) {
// No command, skip: The file itself is already covered:-)
continue;