diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-10-24 08:56:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-24 08:56:29 +0200 |
| commit | c3119d1aa70a25ab7aeb39b0448c1d10c08aba6a (patch) | |
| tree | c2204d569f87e28bc2e48a763650e1b99871f0ed /src/libs/cplusplus/FastPreprocessor.cpp | |
| parent | 328daa9c5aa9a438a0187bb28e238396451f8548 (diff) | |
| parent | b889bb1608badceed0dc1175f3322ea8015f8924 (diff) | |
| download | qt-creator-c3119d1aa70a25ab7aeb39b0448c1d10c08aba6a.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
qtcreator.pri
src/plugins/qnx/qnxutils.cpp
Change-Id: I019ad21fb4c128eb736c8ab2d09310757e3be037
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()); } |