From 4fe3cf8ee991e6adf3756019ff9d326769f0acf0 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Sat, 29 Oct 2011 19:55:36 +0200 Subject: moc: support c++11 style enums Task-number: QTBUG-21480 Change-Id: Ic116a5a06dd68036823f27146e49511c68cf2de6 Reviewed-by: Simon Hausmann --- src/tools/moc/generator.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/tools/moc/generator.cpp') diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index 72fda2ddf8..1ed7de228a 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -622,10 +622,12 @@ void Generator::generateEnums(int index) const EnumDef &e = cdef->enumList.at(i); for (int j = 0; j < e.values.count(); ++j) { const QByteArray &val = e.values.at(j); - fprintf(out, " %4d, uint(%s::%s),\n", - strreg(val), - cdef->qualified.constData(), - val.constData()); + QByteArray code = cdef->qualified.constData(); + if (e.isEnumClass) + code += "::" + e.name; + code += "::" + val; + fprintf(out, " %4d, uint(%s),\n", + strreg(val), code.constData()); } } } -- cgit v1.2.3