From d57b405f298994eafe192914d4efb6697c7e0b48 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Tue, 1 Oct 2013 14:48:31 +0200 Subject: CppTools: fix inclusion of "injected" defines. Task-number: QTCREATORBUG-10280 Change-Id: Ibc6ffeedb97a31a35a2d1f00625506f844692e16 Reviewed-by: Nikolai Kosjar --- src/libs/cplusplus/FastPreprocessor.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/libs/cplusplus/FastPreprocessor.cpp') diff --git a/src/libs/cplusplus/FastPreprocessor.cpp b/src/libs/cplusplus/FastPreprocessor.cpp index 45f1d24d37..66df01c348 100644 --- a/src/libs/cplusplus/FastPreprocessor.cpp +++ b/src/libs/cplusplus/FastPreprocessor.cpp @@ -63,7 +63,11 @@ QByteArray FastPreprocessor::run(Document::Ptr newDoc, const QByteArray &source) if (Document::Ptr doc = _snapshot.document(fileName)) { _merged.insert(fileName); - mergeEnvironment(Preprocessor::configurationFileName); + for (Snapshot::const_iterator i = _snapshot.begin(), ei = _snapshot.end(); i != ei; ++i) { + if (isInjectedFile(i.key())) + mergeEnvironment(i.key()); + } + foreach (const Document::Include &i, doc->resolvedIncludes()) mergeEnvironment(i.resolvedFileName()); } -- cgit v1.2.1