diff options
author | BogDan Vatra <bogdan@kdab.com> | 2016-08-19 15:44:42 +0300 |
---|---|---|
committer | BogDan Vatra <bogdan@kdab.com> | 2016-08-19 15:41:27 +0000 |
commit | 691dc71a011a28743e4cdbd716c192b21d63b68b (patch) | |
tree | b54d9513c31c9bfc4d0e29819dced0ffdd3d6768 /src/tools/moc/util | |
parent | a1c782062c7f2391178060a7105ad9050b1032e1 (diff) |
Say hello to Q_NAMESPACE
Q_NAMESPACE is useful to add Q_ENUM_NS/Q_ENUMS, Q_FLAG_NS/Q_FLAGS and
Q_CLASSINFO to a namespace.
[ChangeLog] Added Q_NAMESPACE which can be used to add Q_ENUM_NS/
Q_ENUMS, Q_FLAG_NS/Q_FLAGS and Q_CLASSINFO to a namespace
Task-number: QTBUG-54981
Change-Id: Ic61b972794063e77134681fb347d6c4acddcdb44
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/tools/moc/util')
-rw-r--r-- | src/tools/moc/util/generate_keywords.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp index d0f76a4c45..df850c1bdc 100644 --- a/src/tools/moc/util/generate_keywords.cpp +++ b/src/tools/moc/util/generate_keywords.cpp @@ -213,13 +213,16 @@ static const Keyword keywords[] = { { "goto", "GOTO" }, { "return", "RETURN" }, { "Q_OBJECT", "Q_OBJECT_TOKEN" }, + { "Q_NAMESPACE", "Q_NAMESPACE_TOKEN" }, { "Q_GADGET", "Q_GADGET_TOKEN" }, { "Q_PROPERTY", "Q_PROPERTY_TOKEN" }, { "Q_PLUGIN_METADATA", "Q_PLUGIN_METADATA_TOKEN" }, { "Q_ENUMS", "Q_ENUMS_TOKEN" }, { "Q_ENUM", "Q_ENUM_TOKEN" }, + { "Q_ENUM_NS", "Q_ENUM_NS_TOKEN" }, { "Q_FLAGS", "Q_FLAGS_TOKEN" }, { "Q_FLAG", "Q_FLAG_TOKEN" }, + { "Q_FLAG_NS", "Q_FLAG_NS_TOKEN" }, { "Q_DECLARE_FLAGS", "Q_DECLARE_FLAGS_TOKEN" }, { "Q_DECLARE_INTERFACE", "Q_DECLARE_INTERFACE_TOKEN" }, { "Q_DECLARE_METATYPE", "Q_DECLARE_METATYPE_TOKEN" }, |