From 14583137ae445fbfdc82922266f5c0736454f6c4 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Sat, 10 Dec 2011 10:53:39 +0100 Subject: Introduce Q_ENUM and Q_FLAG macros MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/tools/moc/keywords.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tools/moc/keywords.cpp') diff --git a/src/tools/moc/keywords.cpp b/src/tools/moc/keywords.cpp index bb4f2883cb..5bee666c8d 100644 --- a/src/tools/moc/keywords.cpp +++ b/src/tools/moc/keywords.cpp @@ -840,12 +840,12 @@ static const struct {CHARACTER, 0, 78, 393, CHARACTER}, {CHARACTER, 0, 85, 394, CHARACTER}, {CHARACTER, 0, 77, 395, CHARACTER}, - {CHARACTER, 0, 83, 396, CHARACTER}, + {Q_ENUM_TOKEN, 0, 83, 396, CHARACTER}, {Q_ENUMS_TOKEN, 0, 0, 0, CHARACTER}, {CHARACTER, 0, 76, 398, CHARACTER}, {CHARACTER, 0, 65, 399, CHARACTER}, {CHARACTER, 0, 71, 400, CHARACTER}, - {CHARACTER, 0, 83, 401, CHARACTER}, + {Q_FLAG_TOKEN, 0, 83, 401, CHARACTER}, {Q_FLAGS_TOKEN, 0, 0, 0, CHARACTER}, {CHARACTER, 0, 69, 403, CHARACTER}, {CHARACTER, 0, 67, 404, CHARACTER}, -- cgit v1.2.3