From 251f09c953494d6b2c9cd3cdec74ed05a2df1ddc Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Wed, 1 Jul 2009 11:00:00 +0200
Subject: [PATCH] Protected the new (not yet finished) code that merge
environments.
---
src/libs/cplusplus/FastPreprocessor.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/libs/cplusplus/FastPreprocessor.cpp b/src/libs/cplusplus/FastPreprocessor.cpp
index 481e2c715a9..00b6f8eedab 100644
--- a/src/libs/cplusplus/FastPreprocessor.cpp
+++ b/src/libs/cplusplus/FastPreprocessor.cpp
@@ -38,12 +38,14 @@ FastPreprocessor::FastPreprocessor(const Snapshot &snapshot)
QByteArray FastPreprocessor::run(QString fileName, const QString &source)
{
+#ifdef QTCREATOR_WITH_MERGED_ENVIRONMENT
if (Document::Ptr doc = _snapshot.value(fileName)) {
_merged.insert(fileName);
foreach (const Document::Include &i, doc->includes())
mergeEnvironment(i.fileName());
}
+#endif
const QByteArray preprocessed = _preproc(fileName, source);
return preprocessed;
--
GitLab