1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index 8115b52577d..f28c0d215dd 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -159,9 +159,9 @@ void ModelManagerSupportClang::onAbstractEditorSupportRemoved(const QString &fil
 {
     QTC_ASSERT(!filePath.isEmpty(), return);
     if (!cppModelManager()->cppEditorDocument(filePath)) {
-        const QString projectFilePath = Utils::projectFilePathForFile(filePath);
+        const QString projectPartId = Utils::projectPartIdForFile(filePath);
         m_ipcCommunicator.unregisterFilesForCodeCompletion(
-            {ClangBackEnd::FileContainer(filePath, projectFilePath)});
+            {ClangBackEnd::FileContainer(filePath, projectPartId)});
     }
 }
 
@@ -173,9 +173,10 @@ void ModelManagerSupportClang::onProjectPartsUpdated(ProjectExplorer::Project *p
     m_ipcCommunicator.registerProjectsParts(projectInfo.projectParts());
 }
 
-void ModelManagerSupportClang::onProjectPartsRemoved(const QStringList &projectFiles)
+void ModelManagerSupportClang::onProjectPartsRemoved(const QStringList &projectPartIds)
 {
-    m_ipcCommunicator.unregisterProjectPartsForCodeCompletion(projectFiles);
+    if (!projectPartIds.isEmpty())
+        m_ipcCommunicator.unregisterProjectPartsForCodeCompletion(projectPartIds);
 }
 
 #ifdef QT_TESTLIB_LIB