diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-04 12:03:34 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-02-04 12:15:32 +0100 |
| commit | ae0ee18a77e81cb9c8dbb5a5798a44d5d135d0b7 (patch) | |
| tree | e6d3585aa9d457b769436a83e47c063bf381b1f6 /src/shared/cplusplus/Token.h | |
| parent | 1b5168c19e8dd22b4c5192108415995ffa4dcd43 (diff) | |
| download | qt-creator-ae0ee18a77e81cb9c8dbb5a5798a44d5d135d0b7.tar.gz | |
Removed #ifdefs so all AST nodes are always there.
Also removed the (conditional) invoke_token from DeclarationAST and use
the qt_invokable_token to store the Q_INVOKABLE, and fixed the ASTMatch
code generation.
Diffstat (limited to 'src/shared/cplusplus/Token.h')
| -rw-r--r-- | src/shared/cplusplus/Token.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/shared/cplusplus/Token.h b/src/shared/cplusplus/Token.h index 1a24eb52b6..c915e31f4e 100644 --- a/src/shared/cplusplus/Token.h +++ b/src/shared/cplusplus/Token.h @@ -238,16 +238,13 @@ 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, |