diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-10-01 14:48:31 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-10-23 12:52:40 +0200 |
| commit | d57b405f298994eafe192914d4efb6697c7e0b48 (patch) | |
| tree | 268602f3698497ac89a5c336c5ddc78f5bea0cfc /src/libs/cplusplus/FastPreprocessor.cpp | |
| parent | 336644a70dc6b6d9b1be0d8a6f14eb2aadf38778 (diff) | |
| download | qt-creator-d57b405f298994eafe192914d4efb6697c7e0b48.tar.gz | |
CppTools: fix inclusion of "injected" defines.
Task-number: QTCREATORBUG-10280
Change-Id: Ibc6ffeedb97a31a35a2d1f00625506f844692e16
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/libs/cplusplus/FastPreprocessor.cpp')
| -rw-r--r-- | src/libs/cplusplus/FastPreprocessor.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libs/cplusplus/FastPreprocessor.cpp b/src/libs/cplusplus/FastPreprocessor.cpp index 45f1d24d37..66df01c348 100644 --- a/src/libs/cplusplus/FastPreprocessor.cpp +++ b/src/libs/cplusplus/FastPreprocessor.cpp @@ -63,7 +63,11 @@ QByteArray FastPreprocessor::run(Document::Ptr newDoc, const QByteArray &source) if (Document::Ptr doc = _snapshot.document(fileName)) { _merged.insert(fileName); - mergeEnvironment(Preprocessor::configurationFileName); + for (Snapshot::const_iterator i = _snapshot.begin(), ei = _snapshot.end(); i != ei; ++i) { + if (isInjectedFile(i.key())) + mergeEnvironment(i.key()); + } + foreach (const Document::Include &i, doc->resolvedIncludes()) mergeEnvironment(i.resolvedFileName()); } |