Merge the environment from the previous parse.

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)) {

src/libs/cplusplus/FastPreprocessor.h

@@ -54,8 +54,7 @@ public:
     QByteArray run(QString fileName, const QString &source);
 
     // CPlusPlus::Client
-    virtual void sourceNeeded(QString &fileName, IncludeType, unsigned)
-    { mergeEnvironment(fileName); }
+    virtual void sourceNeeded(QString &fileName, IncludeType, unsigned);
 
     virtual void macroAdded(const Macro &) {}