diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2009-06-29 09:59:55 +0200 |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2009-07-01 10:25:31 +0200 |
| commit | f8531cc833313dfccd578b0c3c2df3d6de6389c0 (patch) | |
| tree | 6988c0c942c4768f2893a42244fdf86dc13a3aeb /src/libs/cplusplus/FastPreprocessor.h | |
| parent | 02de79071488a396dea0a5842514558fa13d13f3 (diff) | |
| download | qt-creator-f8531cc833313dfccd578b0c3c2df3d6de6389c0.tar.gz | |
Merge the environment from the previous parse.
Diffstat (limited to 'src/libs/cplusplus/FastPreprocessor.h')
| -rw-r--r-- | src/libs/cplusplus/FastPreprocessor.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libs/cplusplus/FastPreprocessor.h b/src/libs/cplusplus/FastPreprocessor.h index bbdbd535ba..c7e6e2f8b1 100644 --- a/src/libs/cplusplus/FastPreprocessor.h +++ b/src/libs/cplusplus/FastPreprocessor.h @@ -54,8 +54,7 @@ public: QByteArray run(QString fileName, const QString &source); // CPlusPlus::Client - virtual void sourceNeeded(QString &fileName, IncludeType, unsigned) - { mergeEnvironment(fileName); } + virtual void sourceNeeded(QString &fileName, IncludeType, unsigned); virtual void macroAdded(const Macro &) {} |