From 05942b63f8bad6d6787fea10c31f10458cdccd06 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 6 Dec 2016 11:00:27 +0100 Subject: CppTools: Do not put configuration document into global snapshot and working copy These are remnants of the time when we had only one snapshot. Change-Id: I6ff4db645d1065a0ef195834890e0774e2e2c60e Reviewed-by: David Schulz Reviewed-by: Erik Verbruggen --- src/plugins/cpptools/cppmodelmanager.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/plugins/cpptools/cppmodelmanager.cpp') diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 201af6f6a2..b2327f294e 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -593,11 +593,6 @@ WorkingCopy CppModelManager::buildWorkingCopyList() workingCopy.insert(es->fileName(), es->contents(), es->revision()); } - // Add the project configuration file - QByteArray conf = codeModelConfiguration(); - conf += definedMacros(); - workingCopy.insert(configurationFileName(), conf); - return workingCopy; } @@ -850,12 +845,6 @@ QFuture CppModelManager::updateProjectInfo(const ProjectInfo &newProjectIn removeProjectInfoFilesAndIncludesFromSnapshot(oldProjectInfo); filesToReindex.unite(newSourceFiles); - // The "configuration file" includes all defines and therefore should be updated - if (comparer.definesChanged()) { - QMutexLocker snapshotLocker(&d->m_snapshotMutex); - d->m_snapshot.remove(configurationFileName()); - } - // Otherwise check for added and modified files } else { const QSet addedFiles = comparer.addedFiles(); @@ -985,6 +974,9 @@ bool CppModelManager::isClangCodeModelActive() const void CppModelManager::emitDocumentUpdated(Document::Ptr doc) { + if (Client::isInjectedFile(doc->fileName())) + return; + if (replaceDocument(doc)) emit documentUpdated(doc); } -- cgit v1.2.1