diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2009-07-04 20:54:31 +0200 |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2009-07-06 09:53:25 +0200 |
| commit | 2f649be1464e1ba6857f28cfb6c362f8fb0a8ca4 (patch) | |
| tree | aecc1c4cd308a79f3f49bca98874bf33de3bb32d /src/libs/cplusplus/FastPreprocessor.cpp | |
| parent | 93cdff18180f8d3c0cc474aaadfb753702564e32 (diff) | |
| download | qt-creator-2f649be1464e1ba6857f28cfb6c362f8fb0a8ca4.tar.gz | |
Disable macro expansion when preprocessing in fast-mode.
Diffstat (limited to 'src/libs/cplusplus/FastPreprocessor.cpp')
| -rw-r--r-- | src/libs/cplusplus/FastPreprocessor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/cplusplus/FastPreprocessor.cpp b/src/libs/cplusplus/FastPreprocessor.cpp index 00b6f8eeda..087679aeea 100644 --- a/src/libs/cplusplus/FastPreprocessor.cpp +++ b/src/libs/cplusplus/FastPreprocessor.cpp @@ -38,14 +38,14 @@ FastPreprocessor::FastPreprocessor(const Snapshot &snapshot) QByteArray FastPreprocessor::run(QString fileName, const QString &source) { -#ifdef QTCREATOR_WITH_MERGED_ENVIRONMENT + _preproc.setExpandMacros(false); + 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; |