diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-04-26 09:11:59 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-04-26 09:55:32 +0200 |
| commit | 52825a91f9a040a5ac29f5f367f75eb52a5b367a (patch) | |
| tree | 795b0dc932f9564547f8264615c2e613180f0933 /src/plugins/cpptools | |
| parent | ef7b5bb2247f3cbd25aabed979c06a1d7bbf98d8 (diff) | |
| download | qt-creator-52825a91f9a040a5ac29f5f367f75eb52a5b367a.tar.gz | |
C++: Preprocessor: Do not add configurationFileName() to the seen files
After processing configurationFileName() the first time, it was added to
the already seen files (m_included). Thus, on parsing further files, it
was ignored and with that all the project defines.
Task-number: QTCREATORBUG-9107
Change-Id: Ia4817dfa3b30ed27d142f7f3eeb6f099d0653441
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 121d0ebfd2..b79f57e5c8 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -514,7 +514,8 @@ void CppPreprocessor::sourceNeeded(unsigned line, const QString &fileName, Inclu m_currentDoc->addIncludeFile(absoluteFileName, line); if (m_included.contains(absoluteFileName)) return; // we've already seen this file. - m_included.insert(absoluteFileName); + if (absoluteFileName != modelManager()->configurationFileName()) + m_included.insert(absoluteFileName); unsigned editorRevision = 0; QString contents; |