feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Protected the new (not yet finished) code that merge environments.

Browse Source
This commit is contained in:
Roberto Raggi
2009-07-01 11:00:00 +02:00
parent ed2eb296b1
commit 251f09c953
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/cplusplus/FastPreprocessor.cpp
View File

@@ -38,12 +38,14 @@ FastPreprocessor::FastPreprocessor(const Snapshot &snapshot)
QByteArray FastPreprocessor::run(QString fileName, const QString &source) QByteArray FastPreprocessor::run(QString fileName, const QString &source)
{ {
#ifdef QTCREATOR_WITH_MERGED_ENVIRONMENT
if (Document::Ptr doc = _snapshot.value(fileName)) { if (Document::Ptr doc = _snapshot.value(fileName)) {
_merged.insert(fileName); _merged.insert(fileName);
foreach (const Document::Include &i, doc->includes()) foreach (const Document::Include &i, doc->includes())
mergeEnvironment(i.fileName()); mergeEnvironment(i.fileName());
} }
#endif
const QByteArray preprocessed = _preproc(fileName, source); const QByteArray preprocessed = _preproc(fileName, source);
return preprocessed; return preprocessed;