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.h | |
| 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.h')
| -rw-r--r-- | src/shared/cplusplus/Token.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/shared/cplusplus/Token.h b/src/shared/cplusplus/Token.h index cd1cf577c6..1a24eb52b6 100644 --- a/src/shared/cplusplus/Token.h +++ b/src/shared/cplusplus/Token.h @@ -238,9 +238,16 @@ enum Kind { T_Q_FOREACH, T_Q_D, T_Q_Q, - +#ifndef ICHECK_BUILD T_LAST_KEYWORD = T_Q_Q, - +#else + T_Q_INVOKABLE, + T_Q_PROPERTY, + T_Q_ENUMS, + T_Q_FLAGS, + T_Q_DECLARE_FLAGS, + T_LAST_KEYWORD = T_Q_DECLARE_FLAGS, +#endif // aliases T_OR = T_PIPE_PIPE, T_AND = T_AMPER_AMPER, |