From e3bc84c4143498b20f702c0d3b4b0b75a99ffe0e Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 6 Jun 2013 09:35:40 +0200 Subject: C++: Record also unresolved paths for includes Change-Id: Id107b6c1f34f594c5a01502c156963c964235ed7 Reviewed-by: Erik Verbruggen --- src/plugins/cpptools/cpppreprocessor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/cpptools/cpppreprocessor.cpp') diff --git a/src/plugins/cpptools/cpppreprocessor.cpp b/src/plugins/cpptools/cpppreprocessor.cpp index d12b56b207..825b29ce8c 100644 --- a/src/plugins/cpptools/cpppreprocessor.cpp +++ b/src/plugins/cpptools/cpppreprocessor.cpp @@ -331,7 +331,7 @@ void CppPreprocessor::mergeEnvironment(Document::Ptr doc) m_processed.insert(fn); foreach (const Document::Include &incl, doc->includes()) { - QString includedFile = incl.fileName(); + QString includedFile = incl.resolvedFileName(); if (Document::Ptr includedDoc = m_snapshot.document(includedFile)) mergeEnvironment(includedDoc); @@ -364,7 +364,7 @@ void CppPreprocessor::sourceNeeded(unsigned line, const QString &fileName, Inclu QString absoluteFileName = resolveFile(fileName, type); absoluteFileName = QDir::cleanPath(absoluteFileName); if (m_currentDoc && !absoluteFileName.isEmpty()) - m_currentDoc->addIncludeFile(absoluteFileName, line); + m_currentDoc->addIncludeFile(Document::Include(fileName, absoluteFileName, line, type)); if (m_included.contains(absoluteFileName)) return; // we've already seen this file. if (absoluteFileName != modelManager()->configurationFileName()) -- cgit v1.2.1