summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cpptoolsplugin.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2021-05-07 16:10:07 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2021-08-13 12:35:49 +0000
commit33108795d6b2dd1e91942efb3c1c27ad23342295 (patch)
tree084d21ac56db3c55c84f242acc8400f2e68cd81c /src/plugins/cpptools/cpptoolsplugin.cpp
parent3143ba79e3d954e006f261cc0a535724a4fdc08a (diff)
downloadqt-creator-33108795d6b2dd1e91942efb3c1c27ad23342295.tar.gz
CppTools: Turn some classes into pure value types
ProjectInfo, ProjectPart and ProjectUpdateInfo used to carry pointers to Project and/or Toolchain, even though they were used in contexts where these pointers were either unsafe to access or not guaranteed to be valid anymore, which made their use difficult and error-prone. We turn these classes into pure value types by copying in all relevant information before the first async operation takes place. Fixes: QTCREATORBUG-25678 Change-Id: I1914b0dbda6c7dfba6c95e5e92f2d69977755590 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cpptoolsplugin.cpp')
-rw-r--r--src/plugins/cpptools/cpptoolsplugin.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index 1e77501c0f..a334846213 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -469,9 +469,9 @@ QString correspondingHeaderOrSource(const QString &fileName, bool *wasHeader, Ca
// Find files in other projects
} else {
CppModelManager *modelManager = CppModelManager::instance();
- QList<ProjectInfo> projectInfos = modelManager->projectInfos();
- foreach (const ProjectInfo &projectInfo, projectInfos) {
- const ProjectExplorer::Project *project = projectInfo.project().data();
+ QList<ProjectInfo::Ptr> projectInfos = modelManager->projectInfos();
+ foreach (const ProjectInfo::Ptr &projectInfo, projectInfos) {
+ const ProjectExplorer::Project *project = projectForProjectInfo(*projectInfo);
if (project == currentProject)
continue; // We have already checked the current project.