diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2011-12-10 10:53:39 +0100 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2015-01-13 17:52:14 +0100 |
| commit | 14583137ae445fbfdc82922266f5c0736454f6c4 (patch) | |
| tree | 6fdb1e07eb10f6ee9e389ad7cd3b5cecfd105211 /src/tools/moc/util | |
| parent | 74443d7bbb319e949928dd081fde04bccb5f7845 (diff) | |
Introduce Q_ENUM and Q_FLAG macros
In replacement for Q_ENUMS and Q_FLAGS.
Q_ENUM(Foo) has to be put after the declaration of Foo in an object.
It will tell moc to include the enum in the meta object (just like
Q_ENUMS) and will allow templated code to get the metaobject for
that enum.
Will be used by QDebug and QMetaType
Change-Id: Iefaf8ae07dc0359828102bf384809346629b3e23
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Diffstat (limited to 'src/tools/moc/util')
| -rw-r--r-- | src/tools/moc/util/generate_keywords.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp index 98800486a3..1d94d1fbdb 100644 --- a/src/tools/moc/util/generate_keywords.cpp +++ b/src/tools/moc/util/generate_keywords.cpp @@ -222,7 +222,9 @@ static const Keyword keywords[] = { { "Q_PROPERTY", "Q_PROPERTY_TOKEN" }, { "Q_PLUGIN_METADATA", "Q_PLUGIN_METADATA_TOKEN" }, { "Q_ENUMS", "Q_ENUMS_TOKEN" }, + { "Q_ENUM", "Q_ENUM_TOKEN" }, { "Q_FLAGS", "Q_FLAGS_TOKEN" }, + { "Q_FLAG", "Q_FLAG_TOKEN" }, { "Q_DECLARE_FLAGS", "Q_DECLARE_FLAGS_TOKEN" }, { "Q_DECLARE_INTERFACE", "Q_DECLARE_INTERFACE_TOKEN" }, { "Q_DECLARE_METATYPE", "Q_DECLARE_METATYPE_TOKEN" }, |