diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-02-19 11:39:06 -0300 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-02-24 14:08:11 +0100 |
| commit | c2803b00be65a064fa5217bdd016b530d518ab9f (patch) | |
| tree | 31a2453767810f8b791a721c09325972f13814ae /src/plugins/cpptools/cpppreprocessor.cpp | |
| parent | 54471bc3f4ce747dd4ea7d48af363b30c49bb42e (diff) | |
| download | qt-creator-c2803b00be65a064fa5217bdd016b530d518ab9f.tar.gz | |
CppTools: Avoid self-include
...in CPlusPlus::Document due to cyclic includes.
Task-number: QTCREATORBUG-11457
Change-Id: I1ca19c901c26d9984d795a61879dd6b41c57096c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cpppreprocessor.cpp')
| -rw-r--r-- | src/plugins/cpptools/cpppreprocessor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cpppreprocessor.cpp b/src/plugins/cpptools/cpppreprocessor.cpp index f8d14bf123..229d06885f 100644 --- a/src/plugins/cpptools/cpppreprocessor.cpp +++ b/src/plugins/cpptools/cpppreprocessor.cpp @@ -355,7 +355,7 @@ void CppPreprocessor::mergeEnvironment(Document::Ptr doc) if (Document::Ptr includedDoc = m_snapshot.document(includedFile)) mergeEnvironment(includedDoc); - else + else if (!m_included.contains(includedFile)) run(includedFile); } |