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/shared/cplusplus/AST.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/shared/cplusplus/AST.cpp')
| -rw-r--r-- | src/shared/cplusplus/AST.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/cplusplus/AST.cpp b/src/shared/cplusplus/AST.cpp index d394fa3694..5252c2d051 100644 --- a/src/shared/cplusplus/AST.cpp +++ b/src/shared/cplusplus/AST.cpp @@ -2157,7 +2157,7 @@ unsigned ObjCPropertyDeclarationAST::lastToken() const return property_attribute_list->lastToken(); else if (lparen_token) return lparen_token + 1; - + return property_token + 1; } |