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/Token.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/Token.cpp')
| -rw-r--r-- | src/shared/cplusplus/Token.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/cplusplus/Token.cpp b/src/shared/cplusplus/Token.cpp index 61c22b7cb2..a0d1e38d78 100644 --- a/src/shared/cplusplus/Token.cpp +++ b/src/shared/cplusplus/Token.cpp @@ -91,7 +91,7 @@ static const char *token_names[] = { ("@protected"), ("@protocol"), ("@public"), ("@required"), ("@selector"), ("@synchronized"), ("@synthesize"), ("@throw"), ("@try"), - ("SIGNAL"), ("SLOT"), ("Q_SIGNAL"), ("Q_SLOT"), ("signals"), ("slots"), + ("SIGNAL"), ("SLOT"), ("Q_SIGNAL"), ("Q_SLOT"), ("signals"), ("slots"), ("Q_FOREACH"), ("Q_D"), ("Q_Q"), #ifdef ICHECK_BUILD ("Q_INVOKABLE"), ("Q_PROPERTY"), ("Q_ENUMS"), ("Q_FLAGS"), ("Q_DECLARE_FLAGS") |