diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2009-07-01 11:00:00 +0200 |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2009-07-01 11:00:00 +0200 |
| commit | 251f09c953494d6b2c9cd3cdec74ed05a2df1ddc (patch) | |
| tree | 57502bcf2b98e1481ca39358012b14bee00aa669 /src/libs/cplusplus/FastPreprocessor.cpp | |
| parent | ed2eb296b1d551af0eda0e6ad9821ce253c3c3d9 (diff) | |
| download | qt-creator-251f09c953494d6b2c9cd3cdec74ed05a2df1ddc.tar.gz | |
Protected the new (not yet finished) code that merge environments.
Diffstat (limited to 'src/libs/cplusplus/FastPreprocessor.cpp')
| -rw-r--r-- | src/libs/cplusplus/FastPreprocessor.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libs/cplusplus/FastPreprocessor.cpp b/src/libs/cplusplus/FastPreprocessor.cpp index 481e2c715a..00b6f8eeda 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; |