summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cpppreprocessor.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@digia.com>2013-07-25 11:21:31 +0200
committerNikolai Kosjar <nikolai.kosjar@digia.com>2013-08-22 11:57:27 +0200
commitfd9293dd0af0e8f253c0934ede60b72496ee0314 (patch)
treea06df33a43e1eaeddf12d14e863aa84031428c73 /src/plugins/cpptools/cpppreprocessor.cpp
parent2fe1fec16b82561f2e4371bebe1b6d2c29e8fb96 (diff)
downloadqt-creator-fd9293dd0af0e8f253c0934ede60b72496ee0314.tar.gz
CppTools: CppPreprocessor: Track also unresolved includes
Change-Id: Ia36e7e7142dbc030a428369ed04e76e70e8eef0b Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpppreprocessor.cpp')
-rw-r--r--src/plugins/cpptools/cpppreprocessor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cpppreprocessor.cpp b/src/plugins/cpptools/cpppreprocessor.cpp
index 1dae47621f..649d3d6bc9 100644
--- a/src/plugins/cpptools/cpppreprocessor.cpp
+++ b/src/plugins/cpptools/cpppreprocessor.cpp
@@ -332,7 +332,7 @@ void CppPreprocessor::mergeEnvironment(Document::Ptr doc)
m_processed.insert(fn);
- foreach (const Document::Include &incl, doc->includes()) {
+ foreach (const Document::Include &incl, doc->resolvedIncludes()) {
const QString includedFile = incl.resolvedFileName();
if (Document::Ptr includedDoc = m_snapshot.document(includedFile))
@@ -363,7 +363,7 @@ void CppPreprocessor::sourceNeeded(unsigned line, const QString &fileName, Inclu
QString absoluteFileName = resolveFile(fileName, type);
absoluteFileName = QDir::cleanPath(absoluteFileName);
- if (m_currentDoc && !absoluteFileName.isEmpty())
+ if (m_currentDoc)
m_currentDoc->addIncludeFile(Document::Include(fileName, absoluteFileName, line, type));
if (m_included.contains(absoluteFileName))
return; // we've already seen this file.