From c2803b00be65a064fa5217bdd016b530d518ab9f Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Wed, 19 Feb 2014 11:39:06 -0300 Subject: CppTools: Avoid self-include ...in CPlusPlus::Document due to cyclic includes. Task-number: QTCREATORBUG-11457 Change-Id: I1ca19c901c26d9984d795a61879dd6b41c57096c Reviewed-by: Orgad Shaneh Reviewed-by: Erik Verbruggen --- src/plugins/cpptools/cpppreprocessor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/cpptools/cpppreprocessor.cpp') 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); } -- cgit v1.2.1