diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2021-10-15 14:42:17 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2021-10-22 08:01:54 +0000 |
| commit | 2085e2ad0bab2883b951bd9bceee45d9a8aee529 (patch) | |
| tree | b5c537d73bb125964aab0c65ceb10e4821d1c8e1 | |
| parent | c565846723840df9d7dcf351cb322e07a9702951 (diff) | |
CppEditor: Make sure fallback project part is up to date
... with regards to the session include paths.
Amends 0636238429.
Fixes: QTCREATORBUG-26323
(cherry picked from commit 8c86b9bca17da149bb6668960af2da8f13d88f93)
Change-Id: I972a314db607d0b06859744dec4c83e885be3b5c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
| -rw-r--r-- | src/plugins/clangcodemodel/clangmodelmanagersupport.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp index 285aa864d4..daeb0bc340 100644 --- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp +++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp @@ -415,10 +415,6 @@ void ClangModelManagerSupport::onEditorOpened(Core::IEditor *editor) // TODO: Ensure that not fully loaded documents are updated? - // TODO: If the file does not belong to any project and it is a header file, - // it might make sense to check whether the file is included by any file - // that does belong to a project, and if so, use the respective client - // instead. Is this feasible? ProjectExplorer::Project * const project = ProjectExplorer::SessionManager::projectForFile(document->filePath()); if (Client * const client = clientForProject(project)) diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 8d58f429b9..d4303c2137 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -684,6 +684,10 @@ CppModelManager::CppModelManager() connect(KitManager::instance(), &KitManager::kitsChanged, this, &CppModelManager::setupFallbackProjectPart); + connect(this, &CppModelManager::projectPartsRemoved, this, + &CppModelManager::setupFallbackProjectPart); + connect(this, &CppModelManager::projectPartsUpdated, this, + &CppModelManager::setupFallbackProjectPart); setupFallbackProjectPart(); qRegisterMetaType<CPlusPlus::Document::Ptr>("CPlusPlus::Document::Ptr"); |