Merge the environment from the previous parse.

1 files changed, 10 insertions, 0 deletions

diff --git a/src/libs/cplusplus/FastPreprocessor.cpp b/src/libs/cplusplus/FastPreprocessor.cpp
index e1e0bd8c50..481e2c715a 100644
--- a/src/libs/cplusplus/FastPreprocessor.cpp
+++ b/src/libs/cplusplus/FastPreprocessor.cpp
@@ -38,10 +38,20 @@ FastPreprocessor::FastPreprocessor(const Snapshot &snapshot)
 
 QByteArray FastPreprocessor::run(QString fileName, const QString &source)
 {
+    if (Document::Ptr doc = _snapshot.value(fileName)) {
+        _merged.insert(fileName);
+
+        foreach (const Document::Include &i, doc->includes())
+            mergeEnvironment(i.fileName());
+    }
+
     const QByteArray preprocessed = _preproc(fileName, source);
     return preprocessed;
 }
 
+void FastPreprocessor::sourceNeeded(QString &fileName, IncludeType, unsigned)
+{ mergeEnvironment(fileName); }
+
 void FastPreprocessor::mergeEnvironment(const QString &fileName)
 {
     if (! _merged.contains(fileName)) {