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/moc.cpp | |
| 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/moc.cpp')
| -rw-r--r-- | src/tools/moc/moc.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 75349191d4..fe59f430f5 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -696,9 +696,11 @@ void Moc::parse() parsePluginData(&def); break; case Q_ENUMS_TOKEN: + case Q_ENUM_TOKEN: parseEnumOrFlag(&def, false); break; case Q_FLAGS_TOKEN: + case Q_FLAG_TOKEN: parseEnumOrFlag(&def, true); break; case Q_DECLARE_FLAGS_TOKEN: |