From 4b3388172904e629fc6f6f1e3a6323e8fe12b97f Mon Sep 17 00:00:00 2001 From: Wolfgang Beck Date: Tue, 19 Jan 2010 15:26:08 +1000 Subject: Merge ichecker branch changes into the mainline. New project can be found under src/tools/ICheck --- src/shared/cplusplus/Token.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/shared/cplusplus/Token.cpp') 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() : -- cgit v1.2.1