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/designer/formeditor.cpp
	src/plugins/git/gitplugin.cpp

Change-Id: I554a844fab4c55249a00f394f9ba174c7548dbbe
This commit is contained in:
Eike Ziller
2023-12-11 09:28:21 +01:00
parent 7ec55f89f1 ee75c7276b
commit 57d4ea4dcc
12 changed files with 172 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cppeditor/cppmodelmanager.cpp
View File

@@ -1653,7 +1653,10 @@ QList<ProjectPart::ConstPtr> CppModelManager::projectPart(const FilePath &fileNa
}
const FilePath canonicalPath = fileName.canonicalPath();
QWriteLocker locker(&d->m_projectLock);
auto it = d->m_fileToProjectParts.insert(fileName, d->m_fileToProjectParts.value(canonicalPath));
const auto it = d->m_fileToProjectParts.constFind(canonicalPath);
if (it == d->m_fileToProjectParts.constEnd())
return {};
d->m_fileToProjectParts.insert(fileName, it.value());
return it.value();
}