diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-29 22:49:55 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-29 22:50:23 +0100 |
| commit | 75b42f18d886b59dbf3380dd12f39f40005ef08b (patch) | |
| tree | cd1cb5699064fa897f11d9f9f4923c0c0f05d95a /src/libs/cplusplus/PreprocessorClient.cpp | |
| parent | 43203140461174071f7a3e68bf388a6522556810 (diff) | |
| parent | a6ca348636dd92ab1445cff2286b3293163f5cea (diff) | |
| download | qt-creator-75b42f18d886b59dbf3380dd12f39f40005ef08b.tar.gz | |
Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
Diffstat (limited to 'src/libs/cplusplus/PreprocessorClient.cpp')
| -rw-r--r-- | src/libs/cplusplus/PreprocessorClient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/cplusplus/PreprocessorClient.cpp b/src/libs/cplusplus/PreprocessorClient.cpp index 5b57baa7b2..89dfcd4b06 100644 --- a/src/libs/cplusplus/PreprocessorClient.cpp +++ b/src/libs/cplusplus/PreprocessorClient.cpp @@ -62,10 +62,10 @@ using namespace CPlusPlus; /*! \fn void Client::startExpandingMacro(unsigned offset, const Macro ¯o, const QByteArray &originalText, bool inCondition = false, const QVector<MacroArgumentReference> &actuals = QVector<MacroArgumentReference>()) - + Called when starting to expand a macro. The parameter \a inCondition indicates whether the expansion is happening inside a preprocessor conditional. - + \sa stopExpandingMacro() */ |