diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-05-15 11:45:30 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-05-23 08:37:36 +0200 |
| commit | 0d9bf5e54308ee05c8e8da011c09b845c1d1297e (patch) | |
| tree | 3668357393f01b6527cf596111dee7fd612ec79e /src/plugins/cpptools/cpppreprocessor.cpp | |
| parent | 3e80f52414e097bbf81f059f1e6f7ead538105d3 (diff) | |
| download | qt-creator-0d9bf5e54308ee05c8e8da011c09b845c1d1297e.tar.gz | |
C++: Fix 'already seen files' when indexing
Resetting the environment (after each *.cpp file) did not clear the
already seen files (m_included). Because of that the succeeding header
files were not parsed correctly - the environments of the mistakenly
already seen header files were not merged in.
Note that this change slow downs the parsing/indexing of files to its
original speed, as it was before the problematic commit (and it is in
2.7):
commit 82e347095c4bdb7a6419d28798639e60591e3992
C++: Untangle include file resolving from loading.
Task-number: QTCREATORBUG-9205
Change-Id: Iea57b7c59ea04a3c8843fd1291f4c375382958fc
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpppreprocessor.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpppreprocessor.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cpppreprocessor.cpp b/src/plugins/cpptools/cpppreprocessor.cpp index 5ab1c9a04e..5c5d1bd803 100644 --- a/src/plugins/cpptools/cpppreprocessor.cpp +++ b/src/plugins/cpptools/cpppreprocessor.cpp @@ -138,6 +138,7 @@ void CppPreprocessor::resetEnvironment() { m_env.reset(); m_processed.clear(); + m_included.clear(); } void CppPreprocessor::getFileContents(const QString &absoluteFilePath, |