diff options
| author | Wolfgang Beck <wolfgang.beck@nokia.com> | 2010-01-19 15:26:08 +1000 |
|---|---|---|
| committer | Wolfgang Beck <wolfgang.beck@nokia.com> | 2010-01-19 15:26:08 +1000 |
| commit | 4b3388172904e629fc6f6f1e3a6323e8fe12b97f (patch) | |
| tree | 098dca6bbe72201050a4d8ec94c008903eb67ed3 /src/shared/cplusplus/Token.cpp | |
| parent | 29b7594b38f3545bb6a5d5ff08542c0e71a30197 (diff) | |
| download | qt-creator-4b3388172904e629fc6f6f1e3a6323e8fe12b97f.tar.gz | |
Merge ichecker branch changes into the mainline. New project can be found under src/tools/ICheck
Diffstat (limited to 'src/shared/cplusplus/Token.cpp')
| -rw-r--r-- | src/shared/cplusplus/Token.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/shared/cplusplus/Token.cpp b/src/shared/cplusplus/Token.cpp index ce661e43b0..61c22b7cb2 100644 --- a/src/shared/cplusplus/Token.cpp +++ b/src/shared/cplusplus/Token.cpp @@ -91,7 +91,11 @@ static const char *token_names[] = { ("@protected"), ("@protocol"), ("@public"), ("@required"), ("@selector"), ("@synchronized"), ("@synthesize"), ("@throw"), ("@try"), - ("SIGNAL"), ("SLOT"), ("Q_SIGNAL"), ("Q_SLOT"), ("signals"), ("slots"), ("Q_FOREACH"), ("Q_D"), ("Q_Q") + ("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") +#endif }; Token::Token() : |