summaryrefslogtreecommitdiff
path: root/src/shared/cplusplus/Token.cpp
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2010-03-17 14:35:48 +0100
committerRoberto Raggi <roberto.raggi@nokia.com>2010-03-17 14:37:55 +0100
commit2d45bb807086e4f59e6c60f403f6f4f8b99fde34 (patch)
treef8287b70d572498d488eb8e299cecaa94dfded0d /src/shared/cplusplus/Token.cpp
parentbfaf247abd1c3265a6822af934a921d59fbaef18 (diff)
downloadqt-creator-2d45bb807086e4f59e6c60f403f6f4f8b99fde34.tar.gz
Parse and create AST nodes for the Q_MOC_RUN extensions.
Diffstat (limited to 'src/shared/cplusplus/Token.cpp')
-rw-r--r--src/shared/cplusplus/Token.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/shared/cplusplus/Token.cpp b/src/shared/cplusplus/Token.cpp
index cafce02eac..2bb8763e66 100644
--- a/src/shared/cplusplus/Token.cpp
+++ b/src/shared/cplusplus/Token.cpp
@@ -91,9 +91,12 @@ static const char *token_names[] = {
("@protected"), ("@protocol"), ("@public"), ("@required"), ("@selector"),
("@synchronized"), ("@synthesize"), ("@throw"), ("@try"),
+ // Qt keywords
("SIGNAL"), ("SLOT"), ("Q_SIGNAL"), ("Q_SLOT"), ("signals"), ("slots"),
("Q_FOREACH"), ("Q_D"), ("Q_Q"),
- ("Q_INVOKABLE"), ("Q_PROPERTY"), ("Q_INTERFACES"), ("Q_ENUMS"), ("Q_FLAGS")
+ ("Q_INVOKABLE"), ("Q_PROPERTY"), ("Q_INTERFACES"), ("Q_ENUMS"), ("Q_FLAGS"),
+ ("Q_PRIVATE_SLOT"), ("Q_DECLARE_INTERFACE"), ("Q_OBJECT"), ("Q_GADGET"),
+
};
Token::Token() :